|
@@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
#include <linux/of_mdio.h>
|
|
|
#include <linux/of_net.h>
|
|
|
#include <linux/of_platform.h>
|
|
|
-@@ -600,18 +601,14 @@ mt7530_mib_reset(struct dsa_switch *ds)
|
|
|
+@@ -603,18 +604,14 @@ mt7530_mib_reset(struct dsa_switch *ds)
|
|
|
mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE);
|
|
|
}
|
|
|
|
|
@@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
return mdiobus_write_nested(priv->bus, port, regnum, val);
|
|
|
}
|
|
|
|
|
|
-@@ -789,9 +786,8 @@ out:
|
|
|
+@@ -792,9 +789,8 @@ out:
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
int devad;
|
|
|
int ret;
|
|
|
|
|
|
-@@ -807,10 +803,9 @@ mt7531_ind_phy_read(struct dsa_switch *d
|
|
|
+@@ -810,10 +806,9 @@ mt7531_ind_phy_read(struct dsa_switch *d
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -71,7 +71,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
int devad;
|
|
|
int ret;
|
|
|
|
|
|
-@@ -826,6 +821,22 @@ mt7531_ind_phy_write(struct dsa_switch *
|
|
|
+@@ -829,6 +824,22 @@ mt7531_ind_phy_write(struct dsa_switch *
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
static void
|
|
|
mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset,
|
|
|
uint8_t *data)
|
|
|
-@@ -1793,6 +1804,210 @@ mt7530_setup_gpio(struct mt7530_priv *pr
|
|
|
+@@ -1796,6 +1807,210 @@ mt7530_setup_gpio(struct mt7530_priv *pr
|
|
|
return devm_gpiochip_add_data(dev, gc, priv);
|
|
|
}
|
|
|
|
|
@@ -305,7 +305,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
static int
|
|
|
mt7530_setup(struct dsa_switch *ds)
|
|
|
{
|
|
|
-@@ -2744,24 +2959,20 @@ static int
|
|
|
+@@ -2747,24 +2962,20 @@ static int
|
|
|
mt753x_setup(struct dsa_switch *ds)
|
|
|
{
|
|
|
struct mt7530_priv *priv = ds->priv;
|
|
@@ -340,7 +340,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
}
|
|
|
|
|
|
static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,
|
|
|
-@@ -2798,8 +3009,6 @@ static const struct dsa_switch_ops mt753
|
|
|
+@@ -2801,8 +3012,6 @@ static const struct dsa_switch_ops mt753
|
|
|
.get_tag_protocol = mtk_get_tag_protocol,
|
|
|
.setup = mt753x_setup,
|
|
|
.get_strings = mt7530_get_strings,
|
|
@@ -349,7 +349,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
.get_ethtool_stats = mt7530_get_ethtool_stats,
|
|
|
.get_sset_count = mt7530_get_sset_count,
|
|
|
.set_ageing_time = mt7530_set_ageing_time,
|
|
|
-@@ -2982,6 +3191,9 @@ mt7530_remove(struct mdio_device *mdiode
|
|
|
+@@ -2985,6 +3194,9 @@ mt7530_remove(struct mdio_device *mdiode
|
|
|
dev_err(priv->dev, "Failed to disable io pwr: %d\n",
|
|
|
ret);
|
|
|
|