diff options
Diffstat (limited to 'target/linux/mediatek')
4 files changed, 16 insertions, 16 deletions
diff --git a/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch b/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch index c01703d07b..44d6cdfe4f 100644 --- a/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch +++ b/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch @@ -12,7 +12,7 @@ Signed-off-by: John Crispin <john@phrozen.org> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -991,6 +991,11 @@ mt7530_setup(struct dsa_switch *ds) +@@ -992,6 +992,11 @@ mt7530_setup(struct dsa_switch *ds) val = mt7530_read(priv, MT7530_MHWTRAP); val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS; val |= MHWTRAP_MANUAL; diff --git a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch index 0442506977..a317b52e13 100644 --- a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch +++ b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -670,6 +670,9 @@ static int +@@ -671,6 +671,9 @@ static int mt7530_cpu_port_enable(struct mt7530_priv *priv, int port) { @@ -10,7 +10,7 @@ /* Enable Mediatek header mode on the cpu port */ mt7530_write(priv, MT7530_PVC_P(port), PORT_SPEC_TAG); -@@ -686,8 +689,12 @@ mt7530_cpu_port_enable(struct mt7530_pri +@@ -687,8 +690,12 @@ mt7530_cpu_port_enable(struct mt7530_pri /* CPU port gets connected to all user ports of * the switch */ @@ -24,7 +24,7 @@ return 0; } -@@ -697,6 +704,7 @@ mt7530_port_enable(struct dsa_switch *ds +@@ -698,6 +705,7 @@ mt7530_port_enable(struct dsa_switch *ds struct phy_device *phy) { struct mt7530_priv *priv = ds->priv; @@ -32,7 +32,7 @@ mutex_lock(&priv->reg_mutex); -@@ -707,7 +715,7 @@ mt7530_port_enable(struct dsa_switch *ds +@@ -708,7 +716,7 @@ mt7530_port_enable(struct dsa_switch *ds * restore the port matrix if the port is the member of a certain * bridge. */ @@ -41,7 +41,7 @@ priv->ports[port].enable = true; mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, priv->ports[port].pm); -@@ -770,7 +778,8 @@ mt7530_port_bridge_join(struct dsa_switc +@@ -771,7 +779,8 @@ mt7530_port_bridge_join(struct dsa_switc struct net_device *bridge) { struct mt7530_priv *priv = ds->priv; @@ -51,7 +51,7 @@ int i; mutex_lock(&priv->reg_mutex); -@@ -808,6 +817,7 @@ mt7530_port_bridge_leave(struct dsa_swit +@@ -809,6 +818,7 @@ mt7530_port_bridge_leave(struct dsa_swit struct net_device *bridge) { struct mt7530_priv *priv = ds->priv; @@ -59,7 +59,7 @@ int i; mutex_lock(&priv->reg_mutex); -@@ -832,8 +842,8 @@ mt7530_port_bridge_leave(struct dsa_swit +@@ -833,8 +843,8 @@ mt7530_port_bridge_leave(struct dsa_swit */ if (priv->ports[port].enable) mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, @@ -70,7 +70,7 @@ mutex_unlock(&priv->reg_mutex); } -@@ -908,15 +918,7 @@ err: +@@ -909,15 +919,7 @@ err: static enum dsa_tag_protocol mtk_get_tag_protocol(struct dsa_switch *ds) { @@ -87,7 +87,7 @@ } static int -@@ -989,7 +991,7 @@ mt7530_setup(struct dsa_switch *ds) +@@ -990,7 +992,7 @@ mt7530_setup(struct dsa_switch *ds) /* Enable Port 6 only; P5 as GMAC5 which currently is not supported */ val = mt7530_read(priv, MT7530_MHWTRAP); diff --git a/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch b/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch index 4a69e7aadf..9bb7ce152e 100644 --- a/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch +++ b/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch @@ -16,7 +16,7 @@ Signed-off-by: John Crispin <john@phrozen.org> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -677,6 +677,11 @@ mt7530_cpu_port_enable(struct mt7530_pri +@@ -678,6 +678,11 @@ mt7530_cpu_port_enable(struct mt7530_pri mt7530_write(priv, MT7530_PVC_P(port), PORT_SPEC_TAG); diff --git a/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch b/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch index 55f1015770..01c62b03ac 100644 --- a/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch +++ b/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1049,10 +1049,10 @@ static const struct dsa_switch_ops mt753 +@@ -1050,10 +1050,10 @@ static const struct dsa_switch_ops mt753 }; static int @@ -23,7 +23,7 @@ Signed-off-by: John Crispin <john@phrozen.org> dn = mdiodev->dev.of_node; -@@ -1100,7 +1100,12 @@ mt7530_probe(struct mdio_device *mdiodev +@@ -1101,7 +1101,12 @@ mt7530_probe(struct mdio_device *mdiodev } } @@ -37,7 +37,7 @@ Signed-off-by: John Crispin <john@phrozen.org> priv->dev = &mdiodev->dev; priv->ds->priv = priv; priv->ds->ops = &mt7530_switch_ops; -@@ -1110,8 +1115,8 @@ mt7530_probe(struct mdio_device *mdiodev +@@ -1111,8 +1116,8 @@ mt7530_probe(struct mdio_device *mdiodev return dsa_register_switch(priv->ds); } @@ -48,7 +48,7 @@ Signed-off-by: John Crispin <john@phrozen.org> { struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev); int ret = 0; -@@ -1128,6 +1133,8 @@ mt7530_remove(struct mdio_device *mdiode +@@ -1129,6 +1134,8 @@ mt7530_remove(struct mdio_device *mdiode dsa_unregister_switch(priv->ds); mutex_destroy(&priv->reg_mutex); @@ -57,7 +57,7 @@ Signed-off-by: John Crispin <john@phrozen.org> } static const struct of_device_id mt7530_of_match[] = { -@@ -1136,16 +1143,16 @@ static const struct of_device_id mt7530_ +@@ -1137,16 +1144,16 @@ static const struct of_device_id mt7530_ }; MODULE_DEVICE_TABLE(of, mt7530_of_match); |