kernel: Update to version 5.15.183

All patches automatically rebased.

changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.183

Signed-off-by: Antony Kolitsos <zeusomighty@hotmail.com>

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 421678da5956c4a64175cdf0cf84df0acb073681..fb16632c581f2d86d8f74ba50b3684b55f04802a 100644 (file)
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .182
-LINUX_KERNEL_HASH-5.15.182 = b6abfa53315a04e459070b927c58beb41f085433117d58756504d68b67f6a31e
+LINUX_VERSION-5.15 = .183
+LINUX_KERNEL_HASH-5.15.183 = d06f7f629a4d61a87ebd0db285ace9ebf4fce0226b10b2c0ec235e3550c58ee8

diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
index 29d53a8213a9000131e3e3cb17bd9d58c99a4a9e..b1c61fc7d6a9e1ec7466ea012d25a79de91166c9 100644 (file)
--- a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
@@ -323,7 +323,7 @@ SVN-Revision: 35130
                icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);
 --- a/include/linux/types.h
 +++ b/include/linux/types.h
-@@ -231,5 +231,11 @@ typedef void (*swap_func_t)(void *a, voi
+@@ -232,5 +232,11 @@ typedef void (*swap_func_t)(void *a, voi
  typedef int (*cmp_r_func_t)(const void *a, const void *b, const void *priv);
  typedef int (*cmp_func_t)(const void *a, const void *b);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0112-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch b/target/linux/bcm27xx/patches-5.15/950-0112-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
index 8727a59dc43ec27dc0ccf255e09351acbc3e4cb4..94c92d27ad7b1fcbe3a72d950882122c84241b84 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0112-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0112-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
@@ -31,7 +31,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  
 --- a/drivers/net/phy/microchip.c
 +++ b/drivers/net/phy/microchip.c
-@@ -192,6 +192,7 @@ static int lan88xx_probe(struct phy_devi
+@@ -233,6 +233,7 @@ static int lan88xx_probe(struct phy_devi
        struct device *dev = &phydev->mdio.dev;
        struct lan88xx_priv *priv;
        u32 led_modes[4];
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        int len;
  
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-@@ -221,6 +222,32 @@ static int lan88xx_probe(struct phy_devi
+@@ -262,6 +263,32 @@ static int lan88xx_probe(struct phy_devi
                return -EINVAL;
        }
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch b/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
index 62fb302e1c0f7fd713016a0aa45703d0a1fa7532..ec670c75d6e98ead09c5674f8f1282768453dcaa 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
@@ -118,7 +118,7 @@ Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
        - MEDIA_BUS_FMT_RGB666_1X24_CPADHI
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2475,6 +2475,38 @@ static const struct panel_desc innolux_a
+@@ -2476,6 +2476,38 @@ static const struct panel_desc innolux_a
        .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
  };
  
@@ -157,7 +157,7 @@ Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
  static const struct drm_display_mode innolux_at070tn92_mode = {
        .clock = 33333,
        .hdisplay = 800,
-@@ -4698,6 +4730,9 @@ static const struct of_device_id platfor
+@@ -4699,6 +4731,9 @@ static const struct of_device_id platfor
                .compatible = "innolux,at043tn24",
                .data = &innolux_at043tn24,
        }, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
index 5a4b06ecbab094d47cfddbd39d37b13bbb74c033..4fdb1fb43a20e14a84c21f8d027be4a019bca3eb 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3770,6 +3770,31 @@ static const struct panel_desc qishenglo
+@@ -3771,6 +3771,31 @@ static const struct panel_desc qishenglo
        .connector_type = DRM_MODE_CONNECTOR_DPI,
  };
  
@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  static const struct display_timing rocktech_rk070er9427_timing = {
        .pixelclock = { 26400000, 33300000, 46800000 },
        .hactive = { 800, 800, 800 },
-@@ -4877,6 +4902,9 @@ static const struct of_device_id platfor
+@@ -4878,6 +4903,9 @@ static const struct of_device_id platfor
                .compatible = "qishenglong,gopher2b-lcd",
                .data = &qishenglong_gopher2b_lcd,
        }, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
index 3615948ddcc7e2b436b20a6f060037d82a0d303f..bc11a40ec9a3adc35c92995609d52d436bbecca4 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
@@ -13,7 +13,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2323,6 +2323,32 @@ static const struct panel_desc friendlya
+@@ -2324,6 +2324,32 @@ static const struct panel_desc friendlya
        },
  };
  
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
  static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
        .clock = 9000,
        .hdisplay = 480,
-@@ -4740,6 +4766,9 @@ static const struct of_device_id platfor
+@@ -4741,6 +4767,9 @@ static const struct of_device_id platfor
                .compatible = "friendlyarm,hd702e",
                .data = &friendlyarm_hd702e,
        }, {

diff --git a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
index cb409230dcb697f1ff7ca29446f93bc30a4d2e21..2a0ae46304c6dba2e5d4663166e7fc6799752ef5 100644 (file)
--- a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
+++ b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
@@ -289,7 +289,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1363,10 +1363,8 @@ void b53_phylink_validate(struct dsa_swi
+@@ -1365,10 +1365,8 @@ void b53_phylink_validate(struct dsa_swi
                phylink_set(mask, 100baseT_Full);
        }
  

diff --git a/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch b/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch
index f8f914c7b9fc44698149cbc4d6b54fe3beee7a14..96432f5217073c4191dde170326fdbca4f53d050 100644 (file)
--- a/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch
+++ b/target/linux/generic/backport-5.15/743-v5.16-0001-net-dsa-b53-Include-all-ports-in-enabled_ports.patch
@@ -22,7 +22,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -2322,7 +2322,7 @@ static const struct b53_chip_data b53_sw
+@@ -2334,7 +2334,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM5325_DEVICE_ID,
                .dev_name = "BCM5325",
                .vlans = 16,
@@ -31,7 +31,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 2,
                .arl_buckets = 1024,
                .imp_port = 5,
-@@ -2333,7 +2333,7 @@ static const struct b53_chip_data b53_sw
+@@ -2345,7 +2345,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM5365_DEVICE_ID,
                .dev_name = "BCM5365",
                .vlans = 256,
@@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 2,
                .arl_buckets = 1024,
                .imp_port = 5,
-@@ -2344,7 +2344,7 @@ static const struct b53_chip_data b53_sw
+@@ -2356,7 +2356,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM5389_DEVICE_ID,
                .dev_name = "BCM5389",
                .vlans = 4096,
@@ -49,7 +49,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2358,7 +2358,7 @@ static const struct b53_chip_data b53_sw
+@@ -2370,7 +2370,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM5395_DEVICE_ID,
                .dev_name = "BCM5395",
                .vlans = 4096,
@@ -58,7 +58,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2372,7 +2372,7 @@ static const struct b53_chip_data b53_sw
+@@ -2384,7 +2384,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM5397_DEVICE_ID,
                .dev_name = "BCM5397",
                .vlans = 4096,
@@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2386,7 +2386,7 @@ static const struct b53_chip_data b53_sw
+@@ -2398,7 +2398,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM5398_DEVICE_ID,
                .dev_name = "BCM5398",
                .vlans = 4096,
@@ -76,7 +76,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2400,7 +2400,7 @@ static const struct b53_chip_data b53_sw
+@@ -2412,7 +2412,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM53115_DEVICE_ID,
                .dev_name = "BCM53115",
                .vlans = 4096,
@@ -85,7 +85,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .vta_regs = B53_VTA_REGS,
-@@ -2414,7 +2414,7 @@ static const struct b53_chip_data b53_sw
+@@ -2426,7 +2426,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM53125_DEVICE_ID,
                .dev_name = "BCM53125",
                .vlans = 4096,
@@ -94,7 +94,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2456,7 +2456,7 @@ static const struct b53_chip_data b53_sw
+@@ -2468,7 +2468,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM53010_DEVICE_ID,
                .dev_name = "BCM53010",
                .vlans = 4096,
@@ -103,7 +103,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2498,7 +2498,7 @@ static const struct b53_chip_data b53_sw
+@@ -2510,7 +2510,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM53018_DEVICE_ID,
                .dev_name = "BCM53018",
                .vlans = 4096,
@@ -112,7 +112,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2512,7 +2512,7 @@ static const struct b53_chip_data b53_sw
+@@ -2524,7 +2524,7 @@ static const struct b53_chip_data b53_sw
                .chip_id = BCM53019_DEVICE_ID,
                .dev_name = "BCM53019",
                .vlans = 4096,
@@ -121,7 +121,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
-@@ -2654,7 +2654,6 @@ static int b53_switch_init(struct b53_de
+@@ -2666,7 +2666,6 @@ static int b53_switch_init(struct b53_de
                        dev->cpu_port = 5;
        }
  

diff --git a/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch b/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch
index e1304ba79e12ab60a11f3451777f980cf6926aa6..79751b94f2d09bfe428b9ca8caddf934c21f9fa6 100644 (file)
--- a/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch
+++ b/target/linux/generic/backport-5.15/743-v5.16-0002-net-dsa-b53-Drop-BCM5301x-workaround-for-a-wrong-CPU.patch
@@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1305,12 +1305,6 @@ static void b53_adjust_link(struct dsa_s
+@@ -1307,12 +1307,6 @@ static void b53_adjust_link(struct dsa_s
                                return;
                        }
                }

diff --git a/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch b/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch
index 3b35b510569ab5ab2cc922edf93ab80c5854c1fa..f31619214c57929fac0a4e3dc51c7818fbda0809 100644 (file)
--- a/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch
+++ b/target/linux/generic/backport-5.15/743-v5.16-0003-net-dsa-b53-Improve-flow-control-setup-on-BCM5301x.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1236,7 +1236,7 @@ static void b53_adjust_link(struct dsa_s
+@@ -1238,7 +1238,7 @@ static void b53_adjust_link(struct dsa_s
                return;
  
        /* Enable flow control on BCM5301x's CPU port */

diff --git a/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch b/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch
index d7198cdc6cf3cd8cd6b2a2d9f21e791602fe0ae7..ab3607ed05d2ba278187971bec9976efe32c30d4 100644 (file)
--- a/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch
+++ b/target/linux/generic/backport-5.15/743-v5.16-0004-net-dsa-b53-Drop-unused-cpu_port-field.patch
@@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -2320,7 +2320,6 @@ static const struct b53_chip_data b53_sw
+@@ -2332,7 +2332,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 2,
                .arl_buckets = 1024,
                .imp_port = 5,
@@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .duplex_reg = B53_DUPLEX_STAT_FE,
        },
        {
-@@ -2331,7 +2330,6 @@ static const struct b53_chip_data b53_sw
+@@ -2343,7 +2342,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 2,
                .arl_buckets = 1024,
                .imp_port = 5,
@@ -35,7 +35,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .duplex_reg = B53_DUPLEX_STAT_FE,
        },
        {
-@@ -2342,7 +2340,6 @@ static const struct b53_chip_data b53_sw
+@@ -2354,7 +2352,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2356,7 +2353,6 @@ static const struct b53_chip_data b53_sw
+@@ -2368,7 +2365,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -51,7 +51,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2370,7 +2366,6 @@ static const struct b53_chip_data b53_sw
+@@ -2382,7 +2378,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -59,7 +59,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS_9798,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2384,7 +2379,6 @@ static const struct b53_chip_data b53_sw
+@@ -2396,7 +2391,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS_9798,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2399,7 +2393,6 @@ static const struct b53_chip_data b53_sw
+@@ -2411,7 +2405,6 @@ static const struct b53_chip_data b53_sw
                .arl_buckets = 1024,
                .vta_regs = B53_VTA_REGS,
                .imp_port = 8,
@@ -75,7 +75,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
                .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
-@@ -2412,7 +2405,6 @@ static const struct b53_chip_data b53_sw
+@@ -2424,7 +2417,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -83,7 +83,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2426,7 +2418,6 @@ static const struct b53_chip_data b53_sw
+@@ -2438,7 +2430,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -91,7 +91,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2440,7 +2431,6 @@ static const struct b53_chip_data b53_sw
+@@ -2452,7 +2443,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -99,7 +99,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS_63XX,
                .duplex_reg = B53_DUPLEX_STAT_63XX,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX,
-@@ -2454,7 +2444,6 @@ static const struct b53_chip_data b53_sw
+@@ -2466,7 +2456,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2468,7 +2457,6 @@ static const struct b53_chip_data b53_sw
+@@ -2480,7 +2469,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -115,7 +115,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2482,7 +2470,6 @@ static const struct b53_chip_data b53_sw
+@@ -2494,7 +2482,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -123,7 +123,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2496,7 +2483,6 @@ static const struct b53_chip_data b53_sw
+@@ -2508,7 +2495,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -131,7 +131,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2510,7 +2496,6 @@ static const struct b53_chip_data b53_sw
+@@ -2522,7 +2508,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -139,7 +139,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2524,7 +2509,6 @@ static const struct b53_chip_data b53_sw
+@@ -2536,7 +2521,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -147,7 +147,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2538,7 +2522,6 @@ static const struct b53_chip_data b53_sw
+@@ -2550,7 +2534,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -155,7 +155,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2567,7 +2550,6 @@ static const struct b53_chip_data b53_sw
+@@ -2579,7 +2562,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 1024,
                .imp_port = 8,
@@ -163,7 +163,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2581,7 +2563,6 @@ static const struct b53_chip_data b53_sw
+@@ -2593,7 +2575,6 @@ static const struct b53_chip_data b53_sw
                .arl_bins = 4,
                .arl_buckets = 256,
                .imp_port = 8,
@@ -171,7 +171,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
-@@ -2607,7 +2588,6 @@ static int b53_switch_init(struct b53_de
+@@ -2619,7 +2600,6 @@ static int b53_switch_init(struct b53_de
                        dev->vta_regs[2] = chip->vta_regs[2];
                        dev->jumbo_pm_reg = chip->jumbo_pm_reg;
                        dev->imp_port = chip->imp_port;
@@ -179,7 +179,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                        dev->num_vlans = chip->vlans;
                        dev->num_arl_bins = chip->arl_bins;
                        dev->num_arl_buckets = chip->arl_buckets;
-@@ -2639,13 +2619,6 @@ static int b53_switch_init(struct b53_de
+@@ -2651,13 +2631,6 @@ static int b53_switch_init(struct b53_de
                        break;
  #endif
                }

diff --git a/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch b/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
index 0313f70dbee4910254d86c83cad0576a24a5fcc1..75a70b23191cf29630a16685c8f049838c07340c 100644 (file)
--- a/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
+++ b/target/linux/generic/pending-5.15/772-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
@@ -95,7 +95,7 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1223,6 +1223,46 @@ static void b53_force_port_config(struct
+@@ -1225,6 +1225,46 @@ static void b53_force_port_config(struct
        b53_write8(dev, B53_CTRL_PAGE, off, reg);
  }
  
@@ -142,7 +142,7 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  static void b53_adjust_link(struct dsa_switch *ds, int port,
                            struct phy_device *phydev)
  {
-@@ -1249,6 +1289,9 @@ static void b53_adjust_link(struct dsa_s
+@@ -1251,6 +1291,9 @@ static void b53_adjust_link(struct dsa_s
                              tx_pause, rx_pause);
        b53_force_link(dev, port, phydev->link);
  
@@ -152,7 +152,7 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
        if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
                if (port == dev->imp_port)
                        off = B53_RGMII_CTRL_IMP;
-@@ -1433,6 +1476,9 @@ void b53_phylink_mac_link_up(struct dsa_
+@@ -1435,6 +1478,9 @@ void b53_phylink_mac_link_up(struct dsa_
  {
        struct b53_device *dev = ds->priv;
  

diff --git a/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch b/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch
index afe6ad9816d7203f8942e6171bb7d5ccea8a7604..699ae97c22915ee3cb76c4c0ef8642cbfa6fac4d 100644 (file)
--- a/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch
+++ b/target/linux/generic/pending-5.15/774-net-dsa-b53-mmap-allow-passing-a-chip-ID.patch
@@ -100,7 +100,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -2483,6 +2483,19 @@ static const struct b53_chip_data b53_sw
+@@ -2495,6 +2495,19 @@ static const struct b53_chip_data b53_sw
                .jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,
        },
        {

diff --git a/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch b/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch
index ed37aa4eb9428a61585984efbfc438644c13f234..984af3ee188aca65a19810b9ad2ac462345e3ba1 100644 (file)
--- a/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch
+++ b/target/linux/generic/pending-5.15/775-net-dsa-b53-add-BCM63268-RGMII-configuration.patch
@@ -97,7 +97,7 @@ Reviewed-by: Simon Horman <simon.horman@corigine.com>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1254,8 +1254,12 @@ static void b53_adjust_63xx_rgmii(struct
+@@ -1256,8 +1256,12 @@ static void b53_adjust_63xx_rgmii(struct
                break;
        }
  

diff --git a/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch b/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch
index 335a8670b7dc13d62ddc51eef4018b45bc923209..993521cb889ef4f9e88828e0a8f702400f6a0ced 100644 (file)
--- a/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch
+++ b/target/linux/generic/pending-5.15/777-net-dsa-b53-mdio-add-support-for-BCM53134.patch
@@ -100,7 +100,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -2631,6 +2631,20 @@ static const struct b53_chip_data b53_sw
+@@ -2643,6 +2643,20 @@ static const struct b53_chip_data b53_sw
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
                .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
        },
@@ -121,7 +121,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
  };
  
  static int b53_switch_init(struct b53_device *dev)
-@@ -2807,6 +2821,7 @@ int b53_switch_detect(struct b53_device
+@@ -2819,6 +2833,7 @@ int b53_switch_detect(struct b53_device
                case BCM53012_DEVICE_ID:
                case BCM53018_DEVICE_ID:
                case BCM53019_DEVICE_ID: