From 378769b5551714ccaa821b481bfeecbf362f351e Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 19 Aug 2021 20:40:29 +0200 Subject: kernel: bump 5.4 to 5.4.142 Compile-tested: ath79-generic ipq40xx-generic Run-tested: ipq40xx-generic Signed-off-by: David Bauer --- ...-mt7530-Extend-device-data-ready-for-adding-a.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch') diff --git a/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch b/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch index 9ac5599a25..291307791d 100644 --- a/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch +++ b/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch @@ -17,7 +17,7 @@ Signed-off-by: Sean Wang --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -372,8 +372,9 @@ mt7530_fdb_write(struct mt7530_priv *pri +@@ -373,8 +373,9 @@ mt7530_fdb_write(struct mt7530_priv *pri mt7530_write(priv, MT7530_ATA1 + (i * 4), reg[i]); } @@ -28,7 +28,7 @@ Signed-off-by: Sean Wang { struct mt7530_priv *priv = ds->priv; u32 ncpo1, ssc_delta, trgint, i, xtal; -@@ -387,7 +388,7 @@ mt7530_pad_clk_setup(struct dsa_switch * +@@ -388,7 +389,7 @@ mt7530_pad_clk_setup(struct dsa_switch * return -EINVAL; } @@ -37,7 +37,7 @@ Signed-off-by: Sean Wang case PHY_INTERFACE_MODE_RGMII: trgint = 0; /* PLL frequency: 125MHz */ -@@ -409,7 +410,8 @@ mt7530_pad_clk_setup(struct dsa_switch * +@@ -410,7 +411,8 @@ mt7530_pad_clk_setup(struct dsa_switch * } break; default: @@ -47,7 +47,7 @@ Signed-off-by: Sean Wang return -EINVAL; } -@@ -1334,12 +1336,11 @@ mt7530_setup(struct dsa_switch *ds) +@@ -1335,12 +1337,11 @@ mt7530_setup(struct dsa_switch *ds) return 0; } @@ -63,7 +63,7 @@ Signed-off-by: Sean Wang switch (port) { case 0: /* Internal phy */ -@@ -1348,33 +1349,114 @@ static void mt7530_phylink_mac_config(st +@@ -1349,33 +1350,114 @@ static void mt7530_phylink_mac_config(st case 3: case 4: if (state->interface != PHY_INTERFACE_MODE_GMII) @@ -189,7 +189,7 @@ Signed-off-by: Sean Wang return; } -@@ -1442,61 +1524,44 @@ static void mt7530_phylink_mac_link_up(s +@@ -1443,61 +1525,44 @@ static void mt7530_phylink_mac_link_up(s mt7530_set(priv, MT7530_PMCR_P(port), mcr); } @@ -274,7 +274,7 @@ Signed-off-by: Sean Wang phylink_set(mask, Pause); phylink_set(mask, Asym_Pause); -@@ -1592,12 +1657,45 @@ static int mt7530_set_mac_eee(struct dsa +@@ -1593,12 +1658,45 @@ static int mt7530_set_mac_eee(struct dsa return 0; } @@ -323,7 +323,7 @@ Signed-off-by: Sean Wang .get_ethtool_stats = mt7530_get_ethtool_stats, .get_sset_count = mt7530_get_sset_count, .port_enable = mt7530_port_enable, -@@ -1614,18 +1712,43 @@ static const struct dsa_switch_ops mt753 +@@ -1615,18 +1713,43 @@ static const struct dsa_switch_ops mt753 .port_vlan_del = mt7530_port_vlan_del, .port_mirror_add = mt7530_port_mirror_add, .port_mirror_del = mt7530_port_mirror_del, @@ -372,7 +372,7 @@ Signed-off-by: Sean Wang { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, mt7530_of_match); -@@ -1663,8 +1786,21 @@ mt7530_probe(struct mdio_device *mdiodev +@@ -1664,8 +1787,21 @@ mt7530_probe(struct mdio_device *mdiodev /* Get the hardware identifier from the devicetree node. * We will need it for some of the clock and regulator setup. */ -- cgit v1.2.3