]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
kernel: bump 6.6 to 6.6.78
authorJohn Audia <therealgraysky@proton.me>
Mon, 17 Feb 2025 10:12:48 +0000 (05:12 -0500)
committerHauke Mehrtens <hauke@hauke-m.de>
Tue, 25 Feb 2025 22:16:17 +0000 (23:16 +0100)
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.78

Removed upstreamed:
bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch[1]
mediatek/patches-6.6/256-clk-mediatek-mt2701-vdec-fix-conversion-to-mtk_clk_s.patch[2]
mediatek/patches-6.6/257-clk-mediatek-mt2701-aud-fix-conversion-to-mtk_clk_si.patch[3]
mediatek/patches-6.6/258-clk-mediatek-mt2701-bdp-add-missing-dummy-clk.patch[4]
mediatek/patches-6.6/259-clk-mediatek-mt2701-mm-add-missing-dummy-clk.patch[5]
mediatek/patches-6.6/260-clk-mediatek-mt2701-img-add-missing-dummy-clk.patch[6]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=25abffee5ceb6691ecd4f089be2bb28842e2d2fd
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=b6c5237ab7af82c9f1d8d772dbf309bb4aadfdbb
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=20210b5c775d2d96f706591c64bc2ad975c37eaf
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=a1fa3dda6bf0b7ecd95fa8f9125e5486b699a81f
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=fc60e9357f15372698da373ee76de8f52d22aac2
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=6f4868e6b2887b55531bc8e0a4106ef0150e6326

Build system: x86/64
Build-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64
Run-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64

Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/18000
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 57b0304ce93b9e84701de3091c9f272e6b14e6fa)
Link: https://github.com/openwrt/openwrt/pull/17987
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
17 files changed:
include/kernel-6.6
target/linux/bcm27xx/patches-6.6/950-0416-gpio-pca953x-Add-ti-tca9554-compatible-string.patch
target/linux/bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch [deleted file]
target/linux/bcm27xx/patches-6.6/950-0679-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch
target/linux/bcm27xx/patches-6.6/950-0684-drm-fb_helper-Change-query-for-FB-designation-from-d.patch
target/linux/bcm27xx/patches-6.6/950-0923-drm-Add-DRM_MODE_TV_MODE_MONOCHROME.patch
target/linux/bcm27xx/patches-6.6/950-1051-drm-panel-Add-and-initialise-an-orientation-field-to.patch
target/linux/bcm27xx/patches-6.6/950-1365-drm-Set-non-desktop-property-to-true-for-writeback-a.patch
target/linux/bcm27xx/patches-6.6/950-1367-drm-vc4-Increase-number-of-overlay-planes-from-16-to.patch
target/linux/bcm47xx/patches-6.6/791-tg3-no-pci-sleep.patch
target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch
target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch
target/linux/generic/hack-6.6/904-debloat_dma_buf.patch
target/linux/generic/pending-6.6/791-tg3-Fix-DMA-allocations-on-57766-devices.patch
target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
target/linux/ipq40xx/patches-6.6/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch
target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch

index 3f07a92fc487178e67269f54dcc3e343971dacd3..a22eb0f6f94199b3ce010da217fc6b5148097c83 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .77
-LINUX_KERNEL_HASH-6.6.77 = 081089dfcf125aef67aa940ebb995ff789b646129f5d4b2365e1d5685b29a84e
+LINUX_VERSION-6.6 = .78
+LINUX_KERNEL_HASH-6.6.78 = 5aa39a9bd555133ad741058f9908a277e6b36bb928481e747d885b50aaaa93ed
index be8e134cf6e5db9a444c10258f439d11abf5bfa8..e0de6fe1cb8a98100965c267db5cd5ae9480ea44 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/gpio/gpio-pca953x.c
 +++ b/drivers/gpio/gpio-pca953x.c
-@@ -1330,6 +1330,7 @@ static const struct of_device_id pca953x
+@@ -1311,6 +1311,7 @@ static const struct of_device_id pca953x
        { .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), },
        { .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), },
        { .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), },
diff --git a/target/linux/bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch b/target/linux/bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch
deleted file mode 100644 (file)
index 786ba76..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7713ce38e6a26425ace3a57b3d03ba0125c16f89 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 28 Jul 2023 12:00:40 +0100
-Subject: [PATCH 0487/1085] drivers: media: imx296: Add standby delay during
- probe
-
-Add a 2-5ms delay when coming out of standby and before reading the
-sensor info register durning probe, as instructed by the datasheet. This
-standby delay is already present when the sensor starts streaming.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -940,6 +940,8 @@ static int imx296_identify_model(struct
-               return ret;
-       }
-+      usleep_range(2000, 5000);
-+
-       ret = imx296_read(sensor, IMX296_SENSOR_INFO);
-       if (ret < 0) {
-               dev_err(sensor->dev, "failed to read sensor information (%d)\n",
index f94efc25b24ea82651add6bc9babf557cb71ed3e..0b2b28b7f1c8d83422b96c88bff591f68f87c14c 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/drm_fb_helper.c
 +++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1851,7 +1851,7 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1853,7 +1853,7 @@ __drm_fb_helper_initial_config_and_unloc
        struct drm_device *dev = fb_helper->dev;
        struct fb_info *info;
        unsigned int width, height;
@@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
        width = dev->mode_config.max_width;
        height = dev->mode_config.max_height;
-@@ -1879,6 +1879,15 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1881,6 +1881,15 @@ __drm_fb_helper_initial_config_and_unloc
         * register the fbdev emulation instance in kernel_fb_helper_list. */
        mutex_unlock(&fb_helper->lock);
  
index 60cabdffc3165370ca2e8385811bdec7c5b443bb..a63bd11af4efbf64f5922a39bede8db3e3f478d5 100644 (file)
@@ -12,7 +12,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/drm_fb_helper.c
 +++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1879,11 +1879,11 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1881,11 +1881,11 @@ __drm_fb_helper_initial_config_and_unloc
         * register the fbdev emulation instance in kernel_fb_helper_list. */
        mutex_unlock(&fb_helper->lock);
  
index 485196b15a9fde343d67f8c7729da502d74e80b1..c4a5537a8c75fbec5a2069b39af56de14ff645e0 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
 
 --- a/drivers/gpu/drm/drm_connector.c
 +++ b/drivers/gpu/drm/drm_connector.c
-@@ -1049,6 +1049,7 @@ static const struct drm_prop_enum_list d
+@@ -1050,6 +1050,7 @@ static const struct drm_prop_enum_list d
        { DRM_MODE_TV_MODE_PAL_M, "PAL-M" },
        { DRM_MODE_TV_MODE_PAL_N, "PAL-N" },
        { DRM_MODE_TV_MODE_SECAM, "SECAM" },
@@ -29,7 +29,7 @@ Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
  };
  DRM_ENUM_NAME_FN(drm_get_tv_mode_name, drm_tv_mode_enum_list)
  
-@@ -1735,6 +1736,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su
+@@ -1736,6 +1737,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su
   *            TV Mode is CCIR System B (aka 625-lines) together with
   *            the SECAM Color Encoding.
   *
index 694e2a0082feca83c2f5159f304c83afde8573c1..6d745f6e9d75c62a9dda0e335fcff0e83dae9612 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/drm_connector.c
 +++ b/drivers/gpu/drm/drm_connector.c
-@@ -2697,10 +2697,15 @@ int drm_connector_set_orientation_from_p
+@@ -2698,10 +2698,15 @@ int drm_connector_set_orientation_from_p
  {
        enum drm_panel_orientation orientation;
  
index e8f52cbc43e03566c96e37e0eb1d1e300a0e0cf8..a1ac849e3e1e094e1e213f7e51d3b80a1d3b2ab5 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/drm_connector.c
 +++ b/drivers/gpu/drm/drm_connector.c
-@@ -361,7 +361,8 @@ static int __drm_connector_init(struct d
+@@ -362,7 +362,8 @@ static int __drm_connector_init(struct d
  
        drm_object_attach_property(&connector->base,
                                   config->non_desktop_property,
index 6eae6fc2ac2b25d25ab1cb1eb6e70c1cc6fb6199..564d7abeb6a48993352392fac0c46d482870e499 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/drm_connector.c
 +++ b/drivers/gpu/drm/drm_connector.c
-@@ -362,7 +362,7 @@ static int __drm_connector_init(struct d
+@@ -363,7 +363,7 @@ static int __drm_connector_init(struct d
        drm_object_attach_property(&connector->base,
                                   config->non_desktop_property,
                                   (connector_type != DRM_MODE_CONNECTOR_VIRTUAL &&
index 76e979ad58286ed20df831442c54f23990c7ad70..07778737014e6851c7ad9426021475b782186c06 100644 (file)
@@ -5,7 +5,7 @@ when a switch driver is in use.
 
 --- a/drivers/net/ethernet/broadcom/tg3.c
 +++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -4269,7 +4269,8 @@ static int tg3_power_down_prepare(struct
+@@ -4270,7 +4270,8 @@ static int tg3_power_down_prepare(struct
  static void tg3_power_down(struct tg3 *tp)
  {
        pci_wake_from_d3(tp->pdev, tg3_flag(tp, WOL_ENABLE));
index c846c485e0242ee10053c3d132690097b7ce8a4e..220a9681363ad45e07ecc762bb593bfc61742e24 100644 (file)
@@ -330,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  EXPORT_SYMBOL_GPL(nvmem_cell_put);
  
-@@ -2116,11 +2057,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size);
+@@ -2118,11 +2059,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size);
  
  static int __init nvmem_init(void)
  {
index c19931b3fa01e673be458a5bdedb8f1d3e5cdf15..b96134e31503593346e4c586bf6737b5bd7e7595 100644 (file)
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        FUSE_INVALID = -1
  };
  
-@@ -93,7 +94,10 @@ static int imx_ocotp_reg_read(void *cont
+@@ -95,7 +96,10 @@ static int imx_ocotp_reg_read(void *cont
                        continue;
                }
  
@@ -39,8 +39,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +                      *buf++ = readl_relaxed(reg + (i << 2));
        }
  
-       memcpy(val, (u8 *)p, bytes);
-@@ -155,8 +159,30 @@ static const struct ocotp_devtype_data i
+       memcpy(val, ((u8 *)p) + skipbytes, bytes);
+@@ -157,8 +161,30 @@ static const struct ocotp_devtype_data i
        },
  };
  
index 355bd0d70cd26d78c0751a976b9bcd70d73f76e5..3ca98788abd4f94101254d2b415a3ea16b2be77b 100644 (file)
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4483,6 +4483,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4485,6 +4485,7 @@ int wake_up_state(struct task_struct *p,
  {
        return try_to_wake_up(p, state, 0);
  }
index a90d77c9f0440af1d735b25f712a4fd409e360e1..9d219d13e5b54dcae6dbbd99bf4b0b32280a817d 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
 
 --- a/drivers/net/ethernet/broadcom/tg3.c
 +++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -17731,8 +17731,10 @@ static int tg3_init_one(struct pci_dev *
+@@ -17732,8 +17732,10 @@ static int tg3_init_one(struct pci_dev *
        } else
                persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
  
index 1c156d4398a41f9ac24c0b8e467bc06bd04feb31..76c36db38fd85e7faeb82c2213d4d2ef12d73379 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 
 --- a/drivers/mmc/host/sdhci-msm.c
 +++ b/drivers/mmc/host/sdhci-msm.c
-@@ -2320,7 +2320,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
+@@ -2369,7 +2369,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
  
  static const struct sdhci_ops sdhci_msm_ops = {
        .reset = sdhci_and_cqhci_reset,
index cfbb6439748b6d2f17e3e6f6fe4a3689ffb50699..a90b0aaf9b359a6cb293d0f67d1322194d59b7f5 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 
 --- a/drivers/mmc/host/sdhci-msm.c
 +++ b/drivers/mmc/host/sdhci-msm.c
-@@ -1755,49 +1755,49 @@ static unsigned int sdhci_msm_get_min_cl
+@@ -1804,49 +1804,49 @@ static unsigned int sdhci_msm_get_min_cl
        return SDHCI_MSM_MIN_CLOCK;
  }
  
index b545667ce3397fa391ecb57f140206fdf143adbb..dc4f2ecd9acdd57fa83f239e212fbfe70bc11cb9 100644 (file)
@@ -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
-@@ -3271,6 +3271,18 @@ static const struct usb_device_id uvc_id
+@@ -3269,6 +3269,18 @@ static const struct usb_device_id uvc_id
          .bInterfaceSubClass   = 1,
          .bInterfaceProtocol   = 0,
          .driver_info          = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include <media/v4l2-common.h>
  
-@@ -1275,9 +1280,149 @@ static void uvc_video_decode_data(struct
+@@ -1296,9 +1301,149 @@ static void uvc_video_decode_data(struct
        uvc_urb->async_operations++;
  }
  
@@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        /* Mark the buffer as done if the EOF marker is set. */
        if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
                uvc_dbg(stream->dev, FRAME, "Frame complete (EOF found)\n");
-@@ -1859,6 +2004,8 @@ static int uvc_init_video_isoc(struct uv
+@@ -1880,6 +2025,8 @@ static int uvc_init_video_isoc(struct uv
        if (npackets == 0)
                return -ENOMEM;
  
@@ -234,7 +234,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  /* Format flags */
  #define UVC_FMT_FLAG_COMPRESSED               0x00000001
-@@ -585,6 +587,7 @@ struct uvc_device {
+@@ -586,6 +588,7 @@ struct uvc_device {
  
        struct input_dev *input;
        char input_phys[64];