diff options
author | John Audia <therealgraysky@proton.me> | 2022-10-05 06:04:11 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-09 22:26:16 +0200 |
commit | 911012662047ec133bdf4f5e490e0891cb782f3c (patch) | |
tree | 9ca97402f737bf1ae10b9ac81b0794699a9de42d /target/linux/generic/backport-5.15/705-13-v6.0-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch | |
parent | e2da6a0a59a81a4fc0fdffde31abf22ee121e9f5 (diff) | |
download | upstream-911012662047ec133bdf4f5e490e0891cb782f3c.tar.gz upstream-911012662047ec133bdf4f5e490e0891cb782f3c.tar.bz2 upstream-911012662047ec133bdf4f5e490e0891cb782f3c.zip |
kernel: bump 5.15 to 5.15.72
Removed upstreamed:
generic/pending-5.15/722-net-mt7531-only-do-PLL-once-after-the-reset.patch[1]
bcm53xx/patches-5.15/082-v6.0-clk-iproc-Do-not-rely-on-node-name-for-correct-PLL-s.patch[2]
All other patches automatically rebased
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200, mvebu/cortexa72
Run-tested: bcm2711/RPi4B, mt7622/RT3200, mvebu/cortexa72 (RB5009UG+S+IN)
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.72&id=5de02ab84aeca765da0e4d8e999af35325ac67c2
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.72&id=ab5c5787ab5ecdc4a7ea20b4ef542579e1beb49d
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/705-13-v6.0-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/705-13-v6.0-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.15/705-13-v6.0-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch b/target/linux/generic/backport-5.15/705-13-v6.0-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch index 3b5ce7363f..5af91a0f7f 100644 --- a/target/linux/generic/backport-5.15/705-13-v6.0-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch +++ b/target/linux/generic/backport-5.15/705-13-v6.0-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1038,6 +1038,7 @@ static int +@@ -1041,6 +1041,7 @@ static int mt7530_port_enable(struct dsa_switch *ds, int port, struct phy_device *phy) { @@ -29,7 +29,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> struct mt7530_priv *priv = ds->priv; mutex_lock(&priv->reg_mutex); -@@ -1046,7 +1047,11 @@ mt7530_port_enable(struct dsa_switch *ds +@@ -1049,7 +1050,11 @@ mt7530_port_enable(struct dsa_switch *ds * restore the port matrix if the port is the member of a certain * bridge. */ @@ -42,7 +42,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> priv->ports[port].enable = true; mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, priv->ports[port].pm); -@@ -1194,7 +1199,8 @@ mt7530_port_bridge_join(struct dsa_switc +@@ -1197,7 +1202,8 @@ mt7530_port_bridge_join(struct dsa_switc struct net_device *bridge) { struct dsa_port *dp = dsa_to_port(ds, port), *other_dp; @@ -52,7 +52,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> struct mt7530_priv *priv = ds->priv; mutex_lock(&priv->reg_mutex); -@@ -1271,9 +1277,12 @@ mt7530_port_set_vlan_unaware(struct dsa_ +@@ -1274,9 +1280,12 @@ mt7530_port_set_vlan_unaware(struct dsa_ * the CPU port get out of VLAN filtering mode. */ if (all_user_ports_removed) { @@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> | PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT)); } } -@@ -1311,6 +1320,7 @@ mt7530_port_bridge_leave(struct dsa_swit +@@ -1314,6 +1323,7 @@ mt7530_port_bridge_leave(struct dsa_swit struct net_device *bridge) { struct dsa_port *dp = dsa_to_port(ds, port), *other_dp; @@ -75,7 +75,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> struct mt7530_priv *priv = ds->priv; mutex_lock(&priv->reg_mutex); -@@ -1339,8 +1349,8 @@ mt7530_port_bridge_leave(struct dsa_swit +@@ -1342,8 +1352,8 @@ mt7530_port_bridge_leave(struct dsa_swit */ if (priv->ports[port].enable) mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, @@ -86,7 +86,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* When a port is removed from the bridge, the port would be set up * back to the default as is at initial boot which is a VLAN-unaware -@@ -1503,6 +1513,9 @@ static int +@@ -1506,6 +1516,9 @@ static int mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering, struct netlink_ext_ack *extack) { @@ -96,7 +96,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> if (vlan_filtering) { /* The port is being kept as VLAN-unaware port when bridge is * set up with vlan_filtering not being set, Otherwise, the -@@ -1510,7 +1523,7 @@ mt7530_port_vlan_filtering(struct dsa_sw +@@ -1513,7 +1526,7 @@ mt7530_port_vlan_filtering(struct dsa_sw * for becoming a VLAN-aware port. */ mt7530_port_set_vlan_aware(ds, port); |