kernel: bump 5.4 to 5.4.108

[openwrt/openwrt.git] / target / linux / bcm4908 / patches-5.4 / 075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch

diff --git a/target/linux/bcm4908/patches-5.4/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch b/target/linux/bcm4908/patches-5.4/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch
index c7003f640b40abc5def745a51858f00ac809fd9f..9e40b321e0f652374c43e4721dce0e443f161a4e 100644 (file)
--- a/target/linux/bcm4908/patches-5.4/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch
+++ b/target/linux/bcm4908/patches-5.4/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)
  {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
-@@ -591,6 +616,7 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -586,6 +611,7 @@ static void bcm_sf2_sw_mac_config(struct
  {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
        u32 id_mode_dis = 0, port_mode;
@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        u32 reg, offset;
  
        if (port == core_readl(priv, CORE_IMP0_PRT_ID))
-@@ -620,10 +646,12 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -615,10 +641,12 @@ static void bcm_sf2_sw_mac_config(struct
                goto force_link;
        }
  
@@ -79,7 +79,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        reg &= ~ID_MODE_DIS;
        reg &= ~(PORT_MODE_MASK << PORT_MODE_SHIFT);
        reg &= ~(RX_PAUSE_EN | TX_PAUSE_EN);
-@@ -638,7 +666,7 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -633,7 +661,7 @@ static void bcm_sf2_sw_mac_config(struct
                reg |= RX_PAUSE_EN;
        }
  
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  force_link:
        /* Force link settings detected from the PHY */
-@@ -664,6 +692,7 @@ static void bcm_sf2_sw_mac_link_set(stru
+@@ -659,6 +687,7 @@ static void bcm_sf2_sw_mac_link_set(stru
                                    phy_interface_t interface, bool link)
  {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        u32 reg;
  
        if (!phy_interface_mode_is_rgmii(interface) &&
-@@ -671,13 +700,15 @@ static void bcm_sf2_sw_mac_link_set(stru
+@@ -666,13 +695,15 @@ static void bcm_sf2_sw_mac_link_set(stru
            interface != PHY_INTERFACE_MODE_REVMII)
                return;