kernel: Update to version 5.15.174

Manually adapted the following patches:
   bcm27xx/patches-5.15/950-0156-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
   bcm27xx/patches-5.15/950-0173-drm-v3d-Delete-pm_runtime-support.patch
   generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch

Link: https://github.com/openwrt/openwrt/pull/18012
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 2949af40befd53b79615ff04c4f6a0901367dc11..196f7d84ef7831afa2ff59f2eaf7a198fef43082 100644 (file)
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .173
-LINUX_KERNEL_HASH-5.15.173 = 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8
+LINUX_VERSION-5.15 = .174
+LINUX_KERNEL_HASH-5.15.174 = c3e63cb864a05b6bbc886613c9e91714106b7a9ab40c31c101da0ca5b64d760a

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 cfb22ab562cc473e4c5d84d30e419293f50cf41c..9d562ae101996a770ca9e68563b9d80172efc62d 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
@@ -337,7 +337,7 @@ SVN-Revision: 35130
  #endif /* _LINUX_TYPES_H */
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1490,8 +1490,8 @@ struct sk_buff *inet_gro_receive(struct
+@@ -1488,8 +1488,8 @@ struct sk_buff *inet_gro_receive(struct
        if (unlikely(ip_fast_csum((u8 *)iph, 5)))
                goto out;
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
index 3192ce952d2677e75002ce874e45e7fd57a06932..63f7a99519a2cb53fe1220cdceeafe9ce44a2b2f 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -5890,6 +5890,9 @@ int __init cgroup_init_early(void)
+@@ -5893,6 +5893,9 @@ int __init cgroup_init_early(void)
        return 0;
  }
  
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  /**
   * cgroup_init - cgroup initialization
   *
-@@ -5928,6 +5931,12 @@ int __init cgroup_init(void)
+@@ -5931,6 +5934,12 @@ int __init cgroup_init(void)
  
        mutex_unlock(&cgroup_mutex);
  
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        for_each_subsys(ss, ssid) {
                if (ss->early_init) {
                        struct cgroup_subsys_state *css =
-@@ -6520,6 +6529,10 @@ static int __init cgroup_disable(char *s
+@@ -6523,6 +6532,10 @@ static int __init cgroup_disable(char *s
                            strcmp(token, ss->legacy_name))
                                continue;
  
@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
                        static_branch_disable(cgroup_subsys_enabled_key[i]);
                        pr_info("Disabling %s control group subsystem\n",
                                ss->name);
-@@ -6538,6 +6551,31 @@ static int __init cgroup_disable(char *s
+@@ -6541,6 +6554,31 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0055-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-5.15/950-0055-lan78xx-Enable-LEDs-and-auto-negotiation.patch
index 2f2b86d7e99ae203c2a7936673a156d12f71b1e0..ecfa90922f913701176c040432f37d9eee1c30fd 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0055-lan78xx-Enable-LEDs-and-auto-negotiation.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0055-lan78xx-Enable-LEDs-and-auto-negotiation.patch
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2691,6 +2691,11 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2692,6 +2692,11 @@ static int lan78xx_reset(struct lan78xx_
        int ret;
        u32 buf;
        u8 sig;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  
        ret = lan78xx_read_reg(dev, HW_CFG, &buf);
        if (ret < 0)
-@@ -2772,6 +2777,10 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2773,6 +2778,10 @@ static int lan78xx_reset(struct lan78xx_
  
        buf |= HW_CFG_MEF_;
  
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        ret = lan78xx_write_reg(dev, HW_CFG, buf);
        if (ret < 0)
                return ret;
-@@ -2871,6 +2880,9 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2872,6 +2881,9 @@ static int lan78xx_reset(struct lan78xx_
                        buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
                }
        }

diff --git a/target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
index 14f4ee66eff33faa4060a76f15694bb54f933dcc..c24f9ec4beb523ac36b2ce7ab05ccbdcbdeb9174 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
@@ -14,7 +14,7 @@ use the same logic.
 
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -2752,7 +2752,12 @@ static int pl011_setup_port(struct devic
+@@ -2759,7 +2759,12 @@ static int pl011_setup_port(struct devic
        if (IS_ERR(base))
                return PTR_ERR(base);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch b/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
index 416df594accef6cdf6372e4a6667e9e9b4a598c2..f2b7fd8ebb30dfbafebbc23281312276b1e0f7cc 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  
        /* Clear pending error and receive interrupts */
        pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
-@@ -2448,7 +2465,7 @@ static int pl011_console_setup(struct co
+@@ -2455,7 +2472,7 @@ static int pl011_console_setup(struct co
                        plat->init();
        }
  
@@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  
        if (uap->vendor->fixed_options) {
                baud = uap->fixed_baud;
-@@ -2665,6 +2682,7 @@ static struct uart_driver amba_reg = {
+@@ -2672,6 +2689,7 @@ static struct uart_driver amba_reg = {
        .cons                   = AMBA_CONSOLE,
  };
  
@@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  static int pl011_probe_dt_alias(int index, struct device *dev)
  {
        struct device_node *np;
-@@ -2696,6 +2714,7 @@ static int pl011_probe_dt_alias(int inde
+@@ -2703,6 +2721,7 @@ static int pl011_probe_dt_alias(int inde
  
        return ret;
  }

diff --git a/target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
index 7e10f7931cd1d03a67a7bcfbc7f6dd813f0d2ca9..606af19aad9dc03845cb9d3b997848b2ee57bb20 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
    - reg
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -2843,6 +2843,11 @@ static int pl011_probe(struct amba_devic
+@@ -2850,6 +2850,11 @@ static int pl011_probe(struct amba_devic
        if (IS_ERR(uap->clk))
                return PTR_ERR(uap->clk);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0098-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/bcm27xx/patches-5.15/950-0098-lan78xx-Read-initial-EEE-status-from-DT.patch
index 28c87ad7f2c71ffa02c5d46780b42c0f94f14288..39a904313a5117a471c7a368a5ada6bd72086899 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0098-lan78xx-Read-initial-EEE-status-from-DT.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0098-lan78xx-Read-initial-EEE-status-from-DT.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2936,6 +2936,22 @@ static int lan78xx_open(struct net_devic
+@@ -2937,6 +2937,22 @@ static int lan78xx_open(struct net_devic
  
        netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0104-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/bcm27xx/patches-5.15/950-0104-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
index 899d19568c8eeec2983ed1a6185919df3ed1720c..a87565aaa56f679a4be7a8f5d582a63ab4b90ef7 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0104-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0104-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
        u32 *buf;
-@@ -3265,8 +3274,14 @@ static int lan78xx_bind(struct lan78xx_n
+@@ -3266,8 +3275,14 @@ static int lan78xx_bind(struct lan78xx_n
        if (DEFAULT_RX_CSUM_ENABLE)
                dev->net->features |= NETIF_F_RXCSUM;
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0105-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/bcm27xx/patches-5.15/950-0105-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
index e43043bf8513cc0d80222b6b03460502ebfbdc6f..004c362c000bdcdacb16b16a821bbb8bf7e3c343 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0105-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0105-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2252,6 +2252,22 @@ static int lan78xx_phy_init(struct lan78
+@@ -2253,6 +2253,22 @@ static int lan78xx_phy_init(struct lan78
        mii_adv_to_linkmode_adv_t(fc, mii_adv);
        linkmode_or(phydev->advertising, fc, phydev->advertising);
  
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        if (phydev->mdio.dev.of_node) {
                u32 reg;
                int len;
-@@ -2945,22 +2961,6 @@ static int lan78xx_open(struct net_devic
+@@ -2946,22 +2962,6 @@ static int lan78xx_open(struct net_devic
  
        netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0114-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/bcm27xx/patches-5.15/950-0114-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
index f134f96efab52f3b3991871ef348be3af1a1da22..50e3e89a7b3180009cccb880c8f16f8fa1b98d8f 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0114-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0114-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
@@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
        u32 *buf;
-@@ -4125,7 +4130,13 @@ static int lan78xx_probe(struct usb_inte
+@@ -4128,7 +4133,13 @@ static int lan78xx_probe(struct usb_inte
        netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;
        netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0115-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/bcm27xx/patches-5.15/950-0115-lan78xx-EEE-support-is-now-a-PHY-property.patch
index 4bbf9ec6cb344c7b28475b3fb1213d035c68b108..340a7851f5fdc350f734c6911318bf2ec11d12ce 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0115-lan78xx-EEE-support-is-now-a-PHY-property.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0115-lan78xx-EEE-support-is-now-a-PHY-property.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2257,7 +2257,7 @@ static int lan78xx_phy_init(struct lan78
+@@ -2258,7 +2258,7 @@ static int lan78xx_phy_init(struct lan78
        mii_adv_to_linkmode_adv_t(fc, mii_adv);
        linkmode_or(phydev->advertising, fc, phydev->advertising);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0118-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/bcm27xx/patches-5.15/950-0118-lan78xx-use-default-alignment-for-rx-buffers.patch
index 0c8228031ccd530a8843e95f258ec9f975079380..36bcd59246cb3104e4dbd3a22c124f93fddec207 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0118-lan78xx-use-default-alignment-for-rx-buffers.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0118-lan78xx-use-default-alignment-for-rx-buffers.patch
@@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing.
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -3504,7 +3504,7 @@ static int rx_submit(struct lan78xx_net
+@@ -3505,7 +3505,7 @@ static int rx_submit(struct lan78xx_net
        size_t size = dev->rx_urb_size;
        int ret = 0;
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0156-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch b/target/linux/bcm27xx/patches-5.15/950-0156-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
index 166446959e5a76933cbf95e2ae0a093398a8684b..d001f27d436580a900f217cc7a239a2c1b030160 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0156-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0156-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
@@ -37,12 +37,12 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 +      if (ret == 0)
 +              return 0;
 +
-       /* Make sure that another flush isn't already running when we
-        * start this one.
-        */
-@@ -61,6 +71,9 @@ static int v3d_mmu_flush_all(struct v3d_
+       V3D_WRITE(V3D_MMUC_CONTROL, V3D_MMUC_CONTROL_FLUSH |
+                 V3D_MMUC_CONTROL_ENABLE);
+ 
+@@ -52,6 +62,9 @@ static int v3d_mmu_flush_all(struct v3d_
        if (ret)
-               dev_err(v3d->drm.dev, "MMUC flush wait idle failed\n");
+               dev_err(v3d->drm.dev, "MMU TLB clear wait idle failed\n");
  
 +      pm_runtime_mark_last_busy(v3d->dev);
 +      pm_runtime_put_autosuspend(v3d->dev);

diff --git a/target/linux/bcm27xx/patches-5.15/950-0173-drm-v3d-Delete-pm_runtime-support.patch b/target/linux/bcm27xx/patches-5.15/950-0173-drm-v3d-Delete-pm_runtime-support.patch
index 950dd89b9c5c8bc0fb5f6dbef81efa0be07abf6c..b1debfbb249cc9181b36298f1631dcdc4266f538 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0173-drm-v3d-Delete-pm_runtime-support.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0173-drm-v3d-Delete-pm_runtime-support.patch
@@ -47,12 +47,12 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 -      if (ret == 0)
 -              return 0;
 -
-       /* Make sure that another flush isn't already running when we
-        * start this one.
-        */
-@@ -71,9 +63,6 @@ static int v3d_mmu_flush_all(struct v3d_
+       V3D_WRITE(V3D_MMUC_CONTROL, V3D_MMUC_CONTROL_FLUSH |
+                 V3D_MMUC_CONTROL_ENABLE);
+ 
+@@ -62,9 +54,6 @@ static int v3d_mmu_flush_all(struct v3d_
        if (ret)
-               dev_err(v3d->drm.dev, "MMUC flush wait idle failed\n");
+               dev_err(v3d->drm.dev, "MMU TLB clear wait idle failed\n");
  
 -      pm_runtime_mark_last_busy(v3d->dev);
 -      pm_runtime_put_autosuspend(v3d->dev);

diff --git a/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
index e55b02a3dc25ef635d3b46a4a8f332a4dae47cd0..a97cdf83b1e32da8acf45eb7854c511a403987c3 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0208-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
@@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3496,6 +3496,7 @@ static int __spi_validate_bits_per_word(
+@@ -3503,6 +3503,7 @@ static int __spi_validate_bits_per_word(
   */
  int spi_setup(struct spi_device *spi)
  {
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        unsigned        bad_bits, ugly_bits;
        int             status;
  
-@@ -3517,6 +3518,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3524,6 +3525,14 @@ int spi_setup(struct spi_device *spi)
                (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
                 SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
                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 082b245cf5578e0ade5f8a856e11ed7e9e56dcab..62fb302e1c0f7fd713016a0aa45703d0a1fa7532 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
@@ -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,
-@@ -4673,6 +4705,9 @@ static const struct of_device_id platfor
+@@ -4698,6 +4730,9 @@ static const struct of_device_id platfor
                .compatible = "innolux,at043tn24",
                .data = &innolux_at043tn24,
        }, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0426-drm-vc4-Add-debugfs-node-that-dumps-the-current-disp.patch b/target/linux/bcm27xx/patches-5.15/950-0426-drm-vc4-Add-debugfs-node-that-dumps-the-current-disp.patch
index d7a5dcaff9f52e387796e5638870bf28c2e48b53..a42e96f918c7217971cddb28c9a88aca1558f4d2 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0426-drm-vc4-Add-debugfs-node-that-dumps-the-current-disp.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0426-drm-vc4-Add-debugfs-node-that-dumps-the-current-disp.patch
@@ -59,7 +59,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  /* The filter kernel is composed of dwords each containing 3 9-bit
   * signed integers packed next to each other.
   */
-@@ -739,6 +778,8 @@ static int vc4_hvs_bind(struct device *d
+@@ -750,6 +789,8 @@ static int vc4_hvs_bind(struct device *d
        vc4_debugfs_add_regset32(drm, "hvs_regs", &hvs->regset);
        vc4_debugfs_add_file(drm, "hvs_underrun", vc4_hvs_debugfs_underrun,
                             NULL);

diff --git a/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch b/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
index bad2672aee75546b0c49961586ca565617d9d67e..97ea45b9c417da6cdeda2f63fce685475a2f44c7 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c
-@@ -1810,6 +1810,8 @@ static const struct usb_audio_quirk_flag
+@@ -1819,6 +1819,8 @@ static const struct usb_audio_quirk_flag
                   QUIRK_FLAG_IGNORE_CTL_ERROR),
        DEVICE_FLG(0x0951, 0x16ad, /* Kingston HyperX */
                   QUIRK_FLAG_CTL_MSG_DELAY_1M),

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 50af5509bc7b0e46d643593f6faa191a2e48251a..5a4b06ecbab094d47cfddbd39d37b13bbb74c033 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
@@ -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 },
-@@ -4852,6 +4877,9 @@ static const struct of_device_id platfor
+@@ -4877,6 +4902,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-0552-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch b/target/linux/bcm27xx/patches-5.15/950-0552-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
index 4708dca62fba14194cd2aeb566c8d4179faee62a..4b28f05667171fc7beccb14291092539cfbb306c 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0552-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0552-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
@@ -102,7 +102,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  /* The filter kernel is composed of dwords each containing 3 9-bit
   * signed integers packed next to each other.
   */
-@@ -859,6 +937,9 @@ static int vc4_hvs_bind(struct device *d
+@@ -870,6 +948,9 @@ static int vc4_hvs_bind(struct device *d
                             NULL);
        vc4_debugfs_add_file(drm, "hvs_dlists", vc4_hvs_debugfs_dlist,
                             NULL);

diff --git a/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch b/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
index d7be8f356e3a339af9223b4cc0b4e4b59a6fcade..65266b966ea8d81e57504f3d3772bccf2b572f11 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
@@ -205,7 +205,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
                xhci_err(xhci, "Tried to move enqueue past ring segment\n");
                return;
        }
-@@ -3266,7 +3269,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
+@@ -3274,7 +3277,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
         * that clears the EHB.
         */
        while (xhci_handle_event(xhci, ir) > 0) {
@@ -214,7 +214,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
                        continue;
                xhci_update_erst_dequeue(xhci, ir, event_ring_deq);
                event_ring_deq = ir->event_ring->dequeue;
-@@ -3408,7 +3411,8 @@ static int prepare_ring(struct xhci_hcd
+@@ -3416,7 +3419,8 @@ static int prepare_ring(struct xhci_hcd
                }
        }
  

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 446c9a339838884c2b7bf42cc024eb7594cdc4d7..3615948ddcc7e2b436b20a6f060037d82a0d303f 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
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
  static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
        .clock = 9000,
        .hdisplay = 480,
-@@ -4715,6 +4741,9 @@ static const struct of_device_id platfor
+@@ -4740,6 +4766,9 @@ static const struct of_device_id platfor
                .compatible = "friendlyarm,hd702e",
                .data = &friendlyarm_hd702e,
        }, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch b/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
index e88091a74ad39c25bd42f7465f1d1f6d9384f3a9..bbd2b8f1e9aad1997459fb5aea7f0e18685ba8da 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
@@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -3721,14 +3721,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+@@ -3729,14 +3729,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
        unsigned int num_trbs;
        unsigned int start_cycle, num_sgs = 0;
        unsigned int enqd_len, block_len, trb_buff_len, full_len;
@@ -54,7 +54,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        full_len = urb->transfer_buffer_length;
        /* If we have scatter/gather list, we use it. */
        if (urb->num_sgs && !(urb->transfer_flags & URB_DMA_MAP_SINGLE)) {
-@@ -3765,6 +3766,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+@@ -3773,6 +3774,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
        start_cycle = ring->cycle_state;
        send_addr = addr;
  
@@ -72,7 +72,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        /* Queue the TRBs, even if they are zero-length */
        for (enqd_len = 0; first_trb || enqd_len < full_len;
                        enqd_len += trb_buff_len) {
-@@ -3777,6 +3789,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+@@ -3785,6 +3797,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
                if (enqd_len + trb_buff_len > full_len)
                        trb_buff_len = full_len - enqd_len;
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch b/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
index bbae6cb15f3f94bf7885efc1560cc02b72f36871..9ae2f905a7753e5b8438fcda183a73e13a20f83b 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
@@ -13,7 +13,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -3721,7 +3721,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+@@ -3729,7 +3729,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
        unsigned int num_trbs;
        unsigned int start_cycle, num_sgs = 0;
        unsigned int enqd_len, block_len, trb_buff_len, full_len;
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        u32 field, length_field, remainder, maxpacket;
        u64 addr, send_addr;
  
-@@ -3767,14 +3767,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+@@ -3775,14 +3775,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
        send_addr = addr;
  
        if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
@@ -40,7 +40,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        }
  
        /* Queue the TRBs, even if they are zero-length */
-@@ -3789,7 +3784,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+@@ -3797,7 +3792,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
                if (enqd_len + trb_buff_len > full_len)
                        trb_buff_len = full_len - enqd_len;
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch b/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch
index 78237355b709d7c388aa4436352db1088d491dfa..c2401c716f5c9c64059bed5c4fd8622e452f835b 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch
@@ -227,7 +227,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                /* 48k words of 2x12-bit pixels */
                drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
        else
-@@ -1019,7 +1019,7 @@ static int vc4_hvs_bind(struct device *d
+@@ -1030,7 +1030,7 @@ static int vc4_hvs_bind(struct device *d
                             NULL);
        vc4_debugfs_add_file(drm, "hvs_dlists", vc4_hvs_debugfs_dlist,
                             NULL);

diff --git a/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch b/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
index 40e51b4294a75a794741cf8e72ee35c40784d8a2..275c38228963845f807e57f3711bf907e2ec6bb2 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
@@ -200,8 +200,8 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  {
 --- a/mm/internal.h
 +++ b/mm/internal.h
-@@ -35,6 +35,7 @@
- void page_writeback_init(void);
+@@ -54,6 +54,7 @@ int mmap_file(struct file *file, struct
+ void vma_close(struct vm_area_struct *vma);
  
  vm_fault_t do_swap_page(struct vm_fault *vmf);
 +void activate_page(struct page *page);

diff --git a/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch b/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch
index d0cbfaa449ab4f8755a13f00b44d4d209cfbcd15..3842ae760b70ccea013d788a7c96590726316154 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch
+++ b/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch
@@ -354,7 +354,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7704,6 +7704,7 @@ static void __init free_area_init_node(i
+@@ -7705,6 +7705,7 @@ static void __init free_area_init_node(i
        pgdat_set_deferred_range(pgdat);
  
        free_area_init_core(pgdat);

diff --git a/target/linux/generic/backport-5.15/350-v5.18-regmap-add-configurable-downshift-for-addresses.patch b/target/linux/generic/backport-5.15/350-v5.18-regmap-add-configurable-downshift-for-addresses.patch
index 175df150cccdfd7050a41a9a980355902d1bd9f8..1530baf8f416b6949551c00047e212f6131ce5f1 100644 (file)
--- a/target/linux/generic/backport-5.15/350-v5.18-regmap-add-configurable-downshift-for-addresses.patch
+++ b/target/linux/generic/backport-5.15/350-v5.18-regmap-add-configurable-downshift-for-addresses.patch
@@ -29,7 +29,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
                             unsigned int reg, unsigned int val);
 --- a/drivers/base/regmap/regmap.c
 +++ b/drivers/base/regmap/regmap.c
-@@ -823,6 +823,7 @@ struct regmap *__regmap_init(struct devi
+@@ -834,6 +834,7 @@ struct regmap *__regmap_init(struct devi
  
        map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
        map->format.pad_bytes = config->pad_bits / 8;
@@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
        map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
                        config->val_bits + config->pad_bits, 8);
-@@ -1750,6 +1751,7 @@ static int _regmap_raw_write_impl(struct
+@@ -1762,6 +1763,7 @@ static int _regmap_raw_write_impl(struct
                        return ret;
        }
  
@@ -45,7 +45,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        map->format.format_reg(map->work_buf, reg, map->reg_shift);
        regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
                                      map->write_flag_mask);
-@@ -1920,6 +1922,7 @@ static int _regmap_bus_formatted_write(v
+@@ -1932,6 +1934,7 @@ static int _regmap_bus_formatted_write(v
                        return ret;
        }
  
@@ -53,7 +53,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        map->format.format_write(map, reg, val);
  
        trace_regmap_hw_write_start(map, reg, 1);
-@@ -2360,6 +2363,7 @@ static int _regmap_raw_multi_reg_write(s
+@@ -2372,6 +2375,7 @@ static int _regmap_raw_multi_reg_write(s
                unsigned int reg = regs[i].reg;
                unsigned int val = regs[i].def;
                trace_regmap_hw_write_start(map, reg, 1);
@@ -61,7 +61,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
                map->format.format_reg(u8, reg, map->reg_shift);
                u8 += reg_bytes + pad_bytes;
                map->format.format_val(u8, val, 0);
-@@ -2685,6 +2689,7 @@ static int _regmap_raw_read(struct regma
+@@ -2697,6 +2701,7 @@ static int _regmap_raw_read(struct regma
                        return ret;
        }
  

diff --git a/target/linux/generic/backport-5.15/351-v5.18-regmap-allow-a-defined-reg_base-to-be-added-to-every.patch b/target/linux/generic/backport-5.15/351-v5.18-regmap-allow-a-defined-reg_base-to-be-added-to-every.patch
index df716c4b651c263d2c87c9140523ec4ad6a4a907..151187c657d7a4f8d6a38ff82b0ad127fead427b 100644 (file)
--- a/target/linux/generic/backport-5.15/351-v5.18-regmap-allow-a-defined-reg_base-to-be-added-to-every.patch
+++ b/target/linux/generic/backport-5.15/351-v5.18-regmap-allow-a-defined-reg_base-to-be-added-to-every.patch
@@ -33,7 +33,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        void *work_buf;     /* Scratch buffer used to format I/O */
 --- a/drivers/base/regmap/regmap.c
 +++ b/drivers/base/regmap/regmap.c
-@@ -821,6 +821,8 @@ struct regmap *__regmap_init(struct devi
+@@ -832,6 +832,8 @@ struct regmap *__regmap_init(struct devi
        else
                map->alloc_flags = GFP_KERNEL;
  
@@ -42,7 +42,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
        map->format.pad_bytes = config->pad_bits / 8;
        map->format.reg_downshift = config->reg_downshift;
-@@ -1751,6 +1753,7 @@ static int _regmap_raw_write_impl(struct
+@@ -1763,6 +1765,7 @@ static int _regmap_raw_write_impl(struct
                        return ret;
        }
  
@@ -50,7 +50,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        reg >>= map->format.reg_downshift;
        map->format.format_reg(map->work_buf, reg, map->reg_shift);
        regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
-@@ -1922,6 +1925,7 @@ static int _regmap_bus_formatted_write(v
+@@ -1934,6 +1937,7 @@ static int _regmap_bus_formatted_write(v
                        return ret;
        }
  
@@ -58,7 +58,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        reg >>= map->format.reg_downshift;
        map->format.format_write(map, reg, val);
  
-@@ -2363,6 +2367,7 @@ static int _regmap_raw_multi_reg_write(s
+@@ -2375,6 +2379,7 @@ static int _regmap_raw_multi_reg_write(s
                unsigned int reg = regs[i].reg;
                unsigned int val = regs[i].def;
                trace_regmap_hw_write_start(map, reg, 1);
@@ -66,7 +66,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
                reg >>= map->format.reg_downshift;
                map->format.format_reg(u8, reg, map->reg_shift);
                u8 += reg_bytes + pad_bytes;
-@@ -2689,6 +2694,7 @@ static int _regmap_raw_read(struct regma
+@@ -2701,6 +2706,7 @@ static int _regmap_raw_read(struct regma
                        return ret;
        }
  

diff --git a/target/linux/generic/backport-5.15/352-v6.3-regmap-apply-reg_base-and-reg_downshift-for-single-r.patch b/target/linux/generic/backport-5.15/352-v6.3-regmap-apply-reg_base-and-reg_downshift-for-single-r.patch
index 33de94cb17b25e2f3672ca3d1578c24bedfedfcf..2426e583b5a99346757fc9de782f46645af44058 100644 (file)
--- a/target/linux/generic/backport-5.15/352-v6.3-regmap-apply-reg_base-and-reg_downshift-for-single-r.patch
+++ b/target/linux/generic/backport-5.15/352-v6.3-regmap-apply-reg_base-and-reg_downshift-for-single-r.patch
@@ -28,7 +28,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 
 --- a/drivers/base/regmap/regmap.c
 +++ b/drivers/base/regmap/regmap.c
-@@ -1943,6 +1943,8 @@ static int _regmap_bus_reg_write(void *c
+@@ -1955,6 +1955,8 @@ static int _regmap_bus_reg_write(void *c
  {
        struct regmap *map = context;
  
@@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        return map->bus->reg_write(map->bus_context, reg, val);
  }
  
-@@ -2715,6 +2717,8 @@ static int _regmap_bus_reg_read(void *co
+@@ -2727,6 +2729,8 @@ static int _regmap_bus_reg_read(void *co
  {
        struct regmap *map = context;
  
@@ -46,7 +46,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
        return map->bus->reg_read(map->bus_context, reg, val);
  }
  
-@@ -3084,6 +3088,8 @@ static int _regmap_update_bits(struct re
+@@ -3096,6 +3100,8 @@ static int _regmap_update_bits(struct re
                *change = false;
  
        if (regmap_volatile(map, reg) && map->reg_update_bits) {

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 5809231c6fdca39212caac44f0ffb61809276d4d..73758d1bfaef462e69d3250082a1efec96f277bd 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
@@ -394,7 +394,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
 --- a/drivers/net/dsa/microchip/ksz8795.c
 +++ b/drivers/net/dsa/microchip/ksz8795.c
-@@ -1542,15 +1542,13 @@ static void ksz8_validate(struct dsa_swi
+@@ -1550,15 +1550,13 @@ static void ksz8_validate(struct dsa_swi
        phylink_set(mask, 100baseT_Half);
        phylink_set(mask, 100baseT_Full);
  
@@ -747,7 +747,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void mvpp2_xlg_config(struct mvpp2_port *port, unsigned int mode,
 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
 +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
-@@ -1172,9 +1172,8 @@ static int otx2_set_link_ksettings(struc
+@@ -1182,9 +1182,8 @@ static int otx2_set_link_ksettings(struc
        otx2_get_link_ksettings(netdev, &cur_ks);
  
        /* Check requested modes against supported modes by hardware */

diff --git a/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch b/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch
index bbbbf892100647ef8e71b5f6d32476d4280ddec8..be7f2bac589c3fc630e2678fa545f9dc80b6703d 100644 (file)
--- a/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch
+++ b/target/linux/generic/backport-5.15/810-v5.17-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1318,6 +1318,7 @@ static const struct usb_device_id produc
+@@ -1319,6 +1319,7 @@ static const struct usb_device_id produc
        {QMI_FIXED_INTF(0x19d2, 0x1426, 2)},    /* ZTE MF91 */
        {QMI_FIXED_INTF(0x19d2, 0x1428, 2)},    /* Telewell TW-LTE 4G v2 */
        {QMI_FIXED_INTF(0x19d2, 0x1432, 3)},    /* ZTE ME3620 */

diff --git a/target/linux/generic/backport-5.15/828-v6.4-0003-of-Rename-of_modalias_node.patch b/target/linux/generic/backport-5.15/828-v6.4-0003-of-Rename-of_modalias_node.patch
index af0d24fab1a71e3ee189cd53ba1951ddf860e9e5..0b884d48951735af553635a0f535b899cff174fb 100644 (file)
--- a/target/linux/generic/backport-5.15/828-v6.4-0003-of-Rename-of_modalias_node.patch
+++ b/target/linux/generic/backport-5.15/828-v6.4-0003-of-Rename-of_modalias_node.patch
@@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * of_find_node_by_phandle - Find a node given a phandle
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -2144,8 +2144,8 @@ of_register_spi_device(struct spi_contro
+@@ -2154,8 +2154,8 @@ of_register_spi_device(struct spi_contro
        }
  
        /* Select device driver */

diff --git a/target/linux/generic/hack-5.15/259-regmap_dynamic.patch b/target/linux/generic/hack-5.15/259-regmap_dynamic.patch
index ea06821c4bd6feb73a37a279f037f9bce3e52330..220f642b5ffe7b9fd26ab11b8b5689bc0e8ebe92 100644 (file)
--- a/target/linux/generic/hack-5.15/259-regmap_dynamic.patch
+++ b/target/linux/generic/hack-5.15/259-regmap_dynamic.patch
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #include <linux/mutex.h>
  #include <linux/err.h>
  #include <linux/property.h>
-@@ -3364,3 +3365,5 @@ static int __init regmap_initcall(void)
+@@ -3376,3 +3377,5 @@ static int __init regmap_initcall(void)
        return 0;
  }
  postcore_initcall(regmap_initcall);

diff --git a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
index 6e556c67f99a1b724f08413a6f0aece75889dc72..32d302295709af7fc58224b05d89f1ba2ffca4b0 100644 (file)
--- a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1081,12 +1081,18 @@ static const struct usb_device_id produc
+@@ -1081,6 +1081,11 @@ static const struct usb_device_id produc
                USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
                .driver_info = (unsigned long)&qmi_wwan_info,
        },
@@ -19,9 +19,10 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
 +              .driver_info = (unsigned long)&qmi_wwan_info,
 +      },
 +
+       {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0122)},   /* Quectel RG650V */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)},   /* Quectel EC25, EC20 R2.0  Mini PCIe */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)},   /* Quectel EP06/EG06/EM06 */
-       {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)},   /* Quectel EG12/EM12 */
+@@ -1088,6 +1093,7 @@ static const struct usb_device_id produc
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},   /* Quectel EM160R-GL */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},   /* Quectel RM500Q-GL */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},   /* Quectel RM520N */

diff --git a/target/linux/generic/hack-5.15/902-debloat_proc.patch b/target/linux/generic/hack-5.15/902-debloat_proc.patch
index 86fbbb2ec5e257f25f873eb641f226d26fdf122d..df25dd1f41b6c4488ef0be9fec33c7810745f5be 100644 (file)
--- a/target/linux/generic/hack-5.15/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.15/902-debloat_proc.patch
@@ -246,7 +246,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                                &vmalloc_op,
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -2083,10 +2083,12 @@ void __init init_mm_internals(void)
+@@ -2084,10 +2084,12 @@ void __init init_mm_internals(void)
        start_shepherd_timer();
  #endif
  #ifdef CONFIG_PROC_FS

diff --git a/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
index eacd0c166e4d0c01e1961f6fc678bf985b433dac..aff86bfb39e2a95185730eb249d9cd05db783e0c 100644 (file)
--- a/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
+++ b/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7663,7 +7663,7 @@ static void __init alloc_node_mem_map(st
+@@ -7664,7 +7664,7 @@ static void __init alloc_node_mem_map(st
        if (pgdat == NODE_DATA(0)) {
                mem_map = NODE_DATA(0)->node_mem_map;
                if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

diff --git a/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
index c9ceeca433fe2865bed8eb97749733bfaea7a34d..ed629efb3e094e77fbb755b3daccea6ebad527b1 100644 (file)
--- a/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
+++ b/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -7838,7 +7838,7 @@ static int nft_register_flowtable_net_ho
+@@ -7840,7 +7840,7 @@ static int nft_register_flowtable_net_ho
                err = flowtable->data.type->setup(&flowtable->data,
                                                  hook->ops.dev,
                                                  FLOW_BLOCK_BIND);

diff --git a/target/linux/ipq807x/patches-5.15/0064-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch b/target/linux/ipq807x/patches-5.15/0064-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch
index ba3d1750e1fb47f9de064cab8319e01991c10006..6938a4c503b562732840f3c6c07b8c4fdfaa3813 100644 (file)
--- a/target/linux/ipq807x/patches-5.15/0064-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch
+++ b/target/linux/ipq807x/patches-5.15/0064-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch
@@ -14,7 +14,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 
 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
 +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
-@@ -1167,6 +1167,8 @@ static const struct of_device_id pmic_gp
+@@ -1169,6 +1169,8 @@ static const struct of_device_id pmic_gp
        { .compatible = "qcom,pmi8998-gpio", .data = (void *) 14 },
        { .compatible = "qcom,pmk8350-gpio", .data = (void *) 4 },
        { .compatible = "qcom,pmm8155au-gpio", .data = (void *) 10 },

diff --git a/target/linux/mediatek/patches-5.15/432-drivers-spi-Add-support-for-dynamic-calibration.patch b/target/linux/mediatek/patches-5.15/432-drivers-spi-Add-support-for-dynamic-calibration.patch
index a335f8c54883d394a4ab6c5b34f7f94ff6e6ff21..13d98b4392e369a392360cb736e4930fee77f278 100644 (file)
--- a/target/linux/mediatek/patches-5.15/432-drivers-spi-Add-support-for-dynamic-calibration.patch
+++ b/target/linux/mediatek/patches-5.15/432-drivers-spi-Add-support-for-dynamic-calibration.patch
@@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
 
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -1250,6 +1250,70 @@ static int spi_transfer_wait(struct spi_
+@@ -1260,6 +1260,70 @@ static int spi_transfer_wait(struct spi_
        return 0;
  }
  
@@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static void _spi_transfer_delay_ns(u32 ns)
  {
        if (!ns)
-@@ -2037,6 +2101,75 @@ void spi_flush_queue(struct spi_controll
+@@ -2047,6 +2111,75 @@ void spi_flush_queue(struct spi_controll
  /*-------------------------------------------------------------------------*/
  
  #if defined(CONFIG_OF)
@@ -158,7 +158,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
                           struct device_node *nc)
  {
-@@ -2155,6 +2288,10 @@ of_register_spi_device(struct spi_contro
+@@ -2165,6 +2298,10 @@ of_register_spi_device(struct spi_contro
        if (rc)
                goto err_out;
  

diff --git a/target/linux/mediatek/patches-5.15/920-v5.16-watchdog-mtk-add-disable_wdt_extrst-support.patch b/target/linux/mediatek/patches-5.15/920-v5.16-watchdog-mtk-add-disable_wdt_extrst-support.patch
index d9379721fb8a58732e7c9bcf588ade72348172c7..da4c24f8ed2b72e417ac5fbe09f29a9452a2848f 100644 (file)
--- a/target/linux/mediatek/patches-5.15/920-v5.16-watchdog-mtk-add-disable_wdt_extrst-support.patch
+++ b/target/linux/mediatek/patches-5.15/920-v5.16-watchdog-mtk-add-disable_wdt_extrst-support.patch
@@ -28,7 +28,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
  };
  
  struct mtk_wdt_data {
-@@ -256,6 +257,8 @@ static int mtk_wdt_start(struct watchdog
+@@ -262,6 +263,8 @@ static int mtk_wdt_start(struct watchdog
                reg |= (WDT_MODE_IRQ_EN | WDT_MODE_DUAL_EN);
        else
                reg &= ~(WDT_MODE_IRQ_EN | WDT_MODE_DUAL_EN);
@@ -37,7 +37,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
        reg |= (WDT_MODE_EN | WDT_MODE_KEY);
        iowrite32(reg, wdt_base + WDT_MODE);
  
-@@ -381,6 +384,10 @@ static int mtk_wdt_probe(struct platform
+@@ -387,6 +390,10 @@ static int mtk_wdt_probe(struct platform
                if (err)
                        return err;
        }

diff --git a/target/linux/mediatek/patches-5.15/921-v5.19-watchdog-mtk_wdt-mt7986-Add-toprgu-reset-controller.patch b/target/linux/mediatek/patches-5.15/921-v5.19-watchdog-mtk_wdt-mt7986-Add-toprgu-reset-controller.patch
index 96fb215f76c04ed44e2645b0b8252d613222ec8e..7e79bcd460486ea5bd9dc271ea29790a325d2218 100644 (file)
--- a/target/linux/mediatek/patches-5.15/921-v5.19-watchdog-mtk_wdt-mt7986-Add-toprgu-reset-controller.patch
+++ b/target/linux/mediatek/patches-5.15/921-v5.19-watchdog-mtk_wdt-mt7986-Add-toprgu-reset-controller.patch
@@ -39,7 +39,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
  static const struct mtk_wdt_data mt8183_data = {
        .toprgu_sw_rst_num = MT8183_TOPRGU_SW_RST_NUM,
  };
-@@ -418,6 +423,7 @@ static int mtk_wdt_resume(struct device
+@@ -424,6 +429,7 @@ static int mtk_wdt_resume(struct device
  static const struct of_device_id mtk_wdt_dt_ids[] = {
        { .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data },
        { .compatible = "mediatek,mt6589-wdt" },

diff --git a/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
index 291ca4c933607183a27d5a8b355c5fb3a0cb3676..939864e0612b9eaf86aaa8091fa80789f1b16d49 100644 (file)
--- a/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
+++ b/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
@@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
  #include <linux/platform_data/x86/apple.h>
  #include <linux/pm_runtime.h>
  #include <linux/suspend.h>
-@@ -6008,3 +6009,34 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -6011,3 +6012,34 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa73f, dpc_log_size);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa76e, dpc_log_size);
  #endif

diff --git a/target/linux/ramips/patches-5.15/810-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-5.15/810-uvc-add-iPassion-iP2970-support.patch
index 0abb1d59a80c5747f96dc79d5a89105432a6286b..d425a28067419e4d7af82514933a658b15968b71 100644 (file)
--- a/target/linux/ramips/patches-5.15/810-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-5.15/810-uvc-add-iPassion-iP2970-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -3168,6 +3168,18 @@ static const struct usb_device_id uvc_id
+@@ -3225,6 +3225,18 @@ static const struct usb_device_id uvc_id
          .bInterfaceSubClass   = 1,
          .bInterfaceProtocol   = 0,
          .driver_info          = UVC_INFO_META(V4L2_META_FMT_D4XX) },