generic: 6.1: backport various qca8k fixes patch

[openwrt/openwrt.git] / target / linux / generic / backport-6.1 / 790-v6.4-0010-net-dsa-mt7530-introduce-separate-MDIO-driver.patch

diff --git a/target/linux/generic/backport-6.1/790-v6.4-0010-net-dsa-mt7530-introduce-separate-MDIO-driver.patch b/target/linux/generic/backport-6.1/790-v6.4-0010-net-dsa-mt7530-introduce-separate-MDIO-driver.patch
index 219a96731a650fa4c9ab848efaec7e38a85526f3..b75710ba572da2dee8f99ae6442781bf7d5cad84 100644 (file)
--- a/target/linux/generic/backport-6.1/790-v6.4-0010-net-dsa-mt7530-introduce-separate-MDIO-driver.patch
+++ b/target/linux/generic/backport-6.1/790-v6.4-0010-net-dsa-mt7530-introduce-separate-MDIO-driver.patch
@@ -416,7 +416,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static u32
  mt7530_mii_read(struct mt7530_priv *priv, u32 reg)
  {
-@@ -2971,72 +2922,6 @@ static const struct phylink_pcs_ops mt75
+@@ -2975,72 +2926,6 @@ static const struct phylink_pcs_ops mt75
        .pcs_an_restart = mt7530_pcs_an_restart,
  };
  
@@ -489,7 +489,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int
  mt753x_setup(struct dsa_switch *ds)
  {
-@@ -3095,7 +2980,7 @@ static int mt753x_set_mac_eee(struct dsa
+@@ -3099,7 +2984,7 @@ static int mt753x_set_mac_eee(struct dsa
        return 0;
  }
  
@@ -498,7 +498,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .get_tag_protocol       = mtk_get_tag_protocol,
        .setup                  = mt753x_setup,
        .get_strings            = mt7530_get_strings,
-@@ -3129,8 +3014,9 @@ static const struct dsa_switch_ops mt753
+@@ -3133,8 +3018,9 @@ static const struct dsa_switch_ops mt753
        .get_mac_eee            = mt753x_get_mac_eee,
        .set_mac_eee            = mt753x_set_mac_eee,
  };
@@ -509,7 +509,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        [ID_MT7621] = {
                .id = ID_MT7621,
                .pcs_ops = &mt7530_pcs_ops,
-@@ -3163,16 +3049,9 @@ static const struct mt753x_info mt753x_t
+@@ -3167,16 +3053,9 @@ static const struct mt753x_info mt753x_t
                .mac_port_config = mt7531_mac_config,
        },
  };
@@ -528,7 +528,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  mt7530_probe_common(struct mt7530_priv *priv)
  {
        struct device *dev = priv->dev;
-@@ -3209,88 +3088,9 @@ mt7530_probe_common(struct mt7530_priv *
+@@ -3213,88 +3092,9 @@ mt7530_probe_common(struct mt7530_priv *
  
        return 0;
  }
@@ -619,7 +619,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  mt7530_remove_common(struct mt7530_priv *priv)
  {
        if (priv->irq)
-@@ -3300,55 +3100,7 @@ mt7530_remove_common(struct mt7530_priv
+@@ -3304,55 +3104,7 @@ mt7530_remove_common(struct mt7530_priv
  
        mutex_destroy(&priv->reg_mutex);
  }
@@ -678,7 +678,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  MODULE_DESCRIPTION("Driver for Mediatek MT7530 Switch");
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
-@@ -812,4 +812,10 @@ static inline void INIT_MT7530_DUMMY_POL
+@@ -814,4 +814,10 @@ static inline void INIT_MT7530_DUMMY_POL
        p->reg = reg;
  }