kernel: bump 5.4 to 5.4.99

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch b/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
index 82fde98823f73483ca424d9029cfc7bfa05613e4..6c3c525d5f37147da07ac07d13041870b20b4005 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
@@ -254,7 +254,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
                rx_frm_cnt++;
 --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
 +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
-@@ -325,8 +325,15 @@ struct enetc_hw {
+@@ -327,8 +327,15 @@ struct enetc_hw {
  };
  
  /* general register accessors */
@@ -272,7 +272,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  #ifdef ioread64
  #define enetc_rd_reg64(reg)   ioread64((reg))
  #else
-@@ -345,12 +352,102 @@ static inline u64 enetc_rd_reg64(void __
+@@ -347,12 +354,102 @@ static inline u64 enetc_rd_reg64(void __
  }
  #endif
  
@@ -397,7 +397,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  #define enetc_mdio_rd(mdio_priv, off) \
 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
 +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
-@@ -987,6 +987,9 @@ static void enetc_pf_remove(struct pci_d
+@@ -1046,6 +1046,9 @@ static void enetc_pf_remove(struct pci_d
        enetc_pci_remove(pdev);
  }