kernel: bump 5.15 to 5.15.94
[openwrt/staging/aparcar.git] / target / linux / generic / backport-5.15 / 705-12-v6.0-net-dsa-mt7530-rework-mt753-01-_setup.patch
index 165d1d035f87bcddc6470efc312d1f4cde446204..6928c5960a0a73e147afe6b06258e6b054daa7ea 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -2090,11 +2090,12 @@ static int
+@@ -2102,11 +2102,12 @@ static int
  mt7530_setup(struct dsa_switch *ds)
  {
        struct mt7530_priv *priv = ds->priv;
@@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        u32 id, val;
        int ret, i;
  
-@@ -2102,7 +2103,19 @@ mt7530_setup(struct dsa_switch *ds)
+@@ -2114,7 +2115,19 @@ mt7530_setup(struct dsa_switch *ds)
         * controller also is the container for two GMACs nodes representing
         * as two netdev instances.
         */
@@ -51,7 +51,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        ds->assisted_learning_on_cpu_port = true;
        ds->mtu_enforcement_ingress = true;
  
-@@ -2264,6 +2277,7 @@ mt7531_setup(struct dsa_switch *ds)
+@@ -2276,6 +2289,7 @@ mt7531_setup(struct dsa_switch *ds)
  {
        struct mt7530_priv *priv = ds->priv;
        struct mt7530_dummy_poll p;
@@ -59,7 +59,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        u32 val, id;
        int ret, i;
  
-@@ -2338,8 +2352,11 @@ mt7531_setup(struct dsa_switch *ds)
+@@ -2350,8 +2364,11 @@ mt7531_setup(struct dsa_switch *ds)
                                 CORE_PLL_GROUP4, val);
  
        /* BPDU to CPU port */