diff options
author | John Audia <therealgraysky@proton.me> | 2022-10-05 07:58:32 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-18 20:13:41 +0200 |
commit | fb11c635118385184fb088227123783463e7900a (patch) | |
tree | 4edd61fb41fbb99fb3daeac0a68a37187c6dc7b0 /target/linux/generic/backport-5.10 | |
parent | 8fefd5c26caac6a30e39892a69b43526ce1e8c07 (diff) | |
download | upstream-fb11c635118385184fb088227123783463e7900a.tar.gz upstream-fb11c635118385184fb088227123783463e7900a.tar.bz2 upstream-fb11c635118385184fb088227123783463e7900a.zip |
kernel: bump 5.10 to 5.10.147
Removed upstreamed:
bcm53xx/patches-5.10/083-v6.0-clk-iproc-Do-not-rely-on-node-name-for-correct-PLL-s.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.147&id=a8e6cde5062fb2aff81f86cc0770591714bee545
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit e2da6a0a59a81a4fc0fdffde31abf22ee121e9f5)
Diffstat (limited to 'target/linux/generic/backport-5.10')
8 files changed, 24 insertions, 24 deletions
diff --git a/target/linux/generic/backport-5.10/731-v5.12-net-dsa-mt7530-MT7530-optional-GPIO-support.patch b/target/linux/generic/backport-5.10/731-v5.12-net-dsa-mt7530-MT7530-optional-GPIO-support.patch index cf3ccae5bf..bd60df37e3 100644 --- a/target/linux/generic/backport-5.10/731-v5.12-net-dsa-mt7530-MT7530-optional-GPIO-support.patch +++ b/target/linux/generic/backport-5.10/731-v5.12-net-dsa-mt7530-MT7530-optional-GPIO-support.patch @@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> #include <net/dsa.h> #include "mt7530.h" -@@ -1534,6 +1535,109 @@ mtk_get_tag_protocol(struct dsa_switch * +@@ -1537,6 +1538,109 @@ mtk_get_tag_protocol(struct dsa_switch * } } @@ -137,7 +137,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static int mt7530_setup(struct dsa_switch *ds) { -@@ -1676,6 +1780,12 @@ mt7530_setup(struct dsa_switch *ds) +@@ -1679,6 +1783,12 @@ mt7530_setup(struct dsa_switch *ds) } } diff --git a/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch b/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch index 84f8db54aa..2ba6c604a8 100644 --- a/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch +++ b/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2366,6 +2366,17 @@ static void mt753x_phylink_mac_link_up(s +@@ -2371,6 +2371,17 @@ static void mt753x_phylink_mac_link_up(s mcr |= PMCR_RX_FC_EN; } @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mt7530_set(priv, MT7530_PMCR_P(port), mcr); } -@@ -2596,6 +2607,36 @@ mt753x_phy_write(struct dsa_switch *ds, +@@ -2599,6 +2610,36 @@ mt753x_phy_write(struct dsa_switch *ds, return priv->info->phy_write(ds, port, regnum, val); } @@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static const struct dsa_switch_ops mt7530_switch_ops = { .get_tag_protocol = mtk_get_tag_protocol, .setup = mt753x_setup, -@@ -2624,6 +2665,8 @@ static const struct dsa_switch_ops mt753 +@@ -2627,6 +2668,8 @@ static const struct dsa_switch_ops mt753 .phylink_mac_an_restart = mt753x_phylink_mac_an_restart, .phylink_mac_link_down = mt753x_phylink_mac_link_down, .phylink_mac_link_up = mt753x_phylink_mac_link_up, diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index 77b85a232c..1c1884e571 100644 --- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int irq; --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -4987,7 +4987,7 @@ int stmmac_dvr_probe(struct device *devi +@@ -5000,7 +5000,7 @@ int stmmac_dvr_probe(struct device *devi priv->wol_irq = res->wol_irq; priv->lpi_irq = res->lpi_irq; diff --git a/target/linux/generic/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch b/target/linux/generic/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch index 52476b926a..f1fa461aec 100644 --- a/target/linux/generic/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch +++ b/target/linux/generic/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch @@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1015,6 +1015,53 @@ mt7530_port_disable(struct dsa_switch *d +@@ -1018,6 +1018,53 @@ mt7530_port_disable(struct dsa_switch *d mutex_unlock(&priv->reg_mutex); } @@ -73,7 +73,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static void mt7530_stp_state_set(struct dsa_switch *ds, int port, u8 state) { -@@ -2647,6 +2694,8 @@ static const struct dsa_switch_ops mt753 +@@ -2650,6 +2697,8 @@ static const struct dsa_switch_ops mt753 .get_sset_count = mt7530_get_sset_count, .port_enable = mt7530_port_enable, .port_disable = mt7530_port_disable, diff --git a/target/linux/generic/backport-5.10/763-v5.11-net-dsa-mt7530-enable-MTU-normalization.patch b/target/linux/generic/backport-5.10/763-v5.11-net-dsa-mt7530-enable-MTU-normalization.patch index 1c0a80aa78..a239549758 100644 --- a/target/linux/generic/backport-5.10/763-v5.11-net-dsa-mt7530-enable-MTU-normalization.patch +++ b/target/linux/generic/backport-5.10/763-v5.11-net-dsa-mt7530-enable-MTU-normalization.patch @@ -18,7 +18,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1703,6 +1703,7 @@ mt7530_setup(struct dsa_switch *ds) +@@ -1706,6 +1706,7 @@ mt7530_setup(struct dsa_switch *ds) */ dn = dsa_to_port(ds, MT7530_CPU_PORT)->master->dev.of_node->parent; ds->configure_vlan_while_not_filtering = true; @@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> if (priv->id == ID_MT7530) { regulator_set_voltage(priv->core_pwr, 1000000, 1000000); -@@ -1948,6 +1949,7 @@ mt7531_setup(struct dsa_switch *ds) +@@ -1953,6 +1954,7 @@ mt7531_setup(struct dsa_switch *ds) } ds->configure_vlan_while_not_filtering = true; diff --git a/target/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch b/target/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch index d5a3eb8dc3..0b28a4626e 100644 --- a/target/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch +++ b/target/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch @@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -870,6 +870,46 @@ mt7530_get_sset_count(struct dsa_switch +@@ -873,6 +873,46 @@ mt7530_get_sset_count(struct dsa_switch return ARRAY_SIZE(mt7530_mib); } @@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface) { struct mt7530_priv *priv = ds->priv; -@@ -2694,6 +2734,7 @@ static const struct dsa_switch_ops mt753 +@@ -2697,6 +2737,7 @@ static const struct dsa_switch_ops mt753 .phy_write = mt753x_phy_write, .get_ethtool_stats = mt7530_get_ethtool_stats, .get_sset_count = mt7530_get_sset_count, diff --git a/target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch b/target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch index 8208670a38..99f49972ff 100644 --- a/target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch +++ b/target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch @@ -14,7 +14,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -998,9 +998,6 @@ mt753x_cpu_port_enable(struct dsa_switch +@@ -1001,9 +1001,6 @@ mt753x_cpu_port_enable(struct dsa_switch mt7530_write(priv, MT7530_PVC_P(port), PORT_SPEC_TAG); @@ -24,7 +24,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com> /* Set CPU port number */ if (priv->id == ID_MT7621) mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port)); -@@ -1131,6 +1128,20 @@ mt7530_stp_state_set(struct dsa_switch * +@@ -1134,6 +1131,20 @@ mt7530_stp_state_set(struct dsa_switch * } static int @@ -45,7 +45,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com> mt7530_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *bridge) { -@@ -1331,6 +1342,63 @@ err: +@@ -1334,6 +1345,63 @@ err: } static int @@ -109,7 +109,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com> mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid) { struct mt7530_dummy_poll p; -@@ -2740,11 +2808,15 @@ static const struct dsa_switch_ops mt753 +@@ -2743,11 +2811,15 @@ static const struct dsa_switch_ops mt753 .port_change_mtu = mt7530_port_change_mtu, .port_max_mtu = mt7530_port_max_mtu, .port_stp_state_set = mt7530_stp_state_set, diff --git a/target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch b/target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch index 1831670f06..c7e3a4ceb4 100644 --- a/target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch +++ b/target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch @@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #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 <davem@davemloft.net> 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 <davem@davemloft.net> 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 <davem@davemloft.net> 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 <davem@davemloft.net> 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 <davem@davemloft.net> 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 <davem@davemloft.net> } 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 <davem@davemloft.net> .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); |