diff options
| author | John Audia | 2026-04-22 19:59:11 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-04-30 19:18:02 +0000 |
| commit | 098ecd681b3d787b4547f7d05c0a66da0d1757bc (patch) | |
| tree | b6dc1cfc905e363aa4af321df5491eda2f2e3c76 | |
| parent | ff50ccf51fd314038d09d8cc6e1e20323f8ee2c9 (diff) | |
| download | openwrt-098ecd681b3d787b4547f7d05c0a66da0d1757bc.tar.gz | |
kernel: bump 6.12 to 6.12.83
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.83
All patches automatically rebased via update_kernel.sh
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22913
(cherry picked from commit 39964c99093819a450a8da0682c3ae08f105f534)
Link: https://github.com/openwrt/openwrt/pull/23162
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
12 files changed, 44 insertions, 44 deletions
diff --git a/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch index c1b543a92c..f372f3ae22 100644 --- a/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-6.12/900-unaligned_access_hacks.patch @@ -312,7 +312,7 @@ SVN-Revision: 35130 case IPV6_2292HOPOPTS: --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c -@@ -986,7 +986,7 @@ static bool ipv6_hop_jumbo(struct sk_buf +@@ -990,7 +990,7 @@ static bool ipv6_hop_jumbo(struct sk_buf goto drop; } diff --git a/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch b/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch index 0f750e485c..0fcc1b288d 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch @@ -18626,7 +18626,7 @@ Signed-off-by: j-schambacher <joerg@hifiberry.com> * For devices with more than one control interface, we assume the --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -2397,6 +2397,8 @@ static const struct usb_audio_quirk_flag +@@ -2399,6 +2399,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ QUIRK_FLAG_ALIGN_TRANSFER), diff --git a/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index 36c7ab69f5..29f8dd1188 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -255,6 +255,9 @@ +@@ -258,6 +258,9 @@ #define USB_VENDOR_ID_BAANTO 0x2453 #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100 @@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1481,6 +1484,9 @@ +@@ -1484,6 +1487,9 @@ #define USB_VENDOR_ID_XIAOMI 0x2717 #define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014 @@ -44,7 +44,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> #define USB_DEVICE_ID_THT_2P_ARCADE 0x75e1 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -44,6 +44,7 @@ static const struct hid_device_id hid_qu +@@ -45,6 +45,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS692), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM), HID_QUIRK_NOGET }, @@ -52,7 +52,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -216,6 +217,7 @@ static const struct hid_device_id hid_qu +@@ -217,6 +218,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, diff --git a/target/linux/bcm27xx/patches-6.12/950-0179-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/bcm27xx/patches-6.12/950-0179-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index 01644de455..b7782b6180 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0179-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0179-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -2814,8 +2816,8 @@ int gpiod_direction_output(struct gpio_d +@@ -2813,8 +2815,8 @@ int gpiod_direction_output(struct gpio_d value = !!value; /* GPIOs used for enabled IRQs shall not be set as output */ @@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -3766,8 +3768,8 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3765,8 +3767,8 @@ int gpiochip_lock_as_irq(struct gpio_chi } /* To be valid for IRQ the line needs to be input or open drain */ diff --git a/target/linux/bcm27xx/patches-6.12/950-0588-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch b/target/linux/bcm27xx/patches-6.12/950-0588-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch index a562a8a71a..1c5725d7aa 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0588-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0588-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch @@ -90,7 +90,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return; /* Fast path: if the BO is still retained by someone, no need to test -@@ -783,7 +783,7 @@ int vc4_create_bo_ioctl(struct drm_devic +@@ -786,7 +786,7 @@ int vc4_create_bo_ioctl(struct drm_devic struct vc4_bo *bo = NULL; int ret; @@ -99,7 +99,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; ret = vc4_grab_bin_bo(vc4, vc4file); -@@ -813,7 +813,7 @@ int vc4_mmap_bo_ioctl(struct drm_device +@@ -816,7 +816,7 @@ int vc4_mmap_bo_ioctl(struct drm_device struct drm_vc4_mmap_bo *args = data; struct drm_gem_object *gem_obj; @@ -108,7 +108,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; gem_obj = drm_gem_object_lookup(file_priv, args->handle); -@@ -839,7 +839,7 @@ vc4_create_shader_bo_ioctl(struct drm_de +@@ -842,7 +842,7 @@ vc4_create_shader_bo_ioctl(struct drm_de struct vc4_bo *bo = NULL; int ret; @@ -117,7 +117,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; if (args->size == 0) -@@ -918,7 +918,7 @@ int vc4_set_tiling_ioctl(struct drm_devi +@@ -921,7 +921,7 @@ int vc4_set_tiling_ioctl(struct drm_devi struct vc4_bo *bo; bool t_format; @@ -126,7 +126,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; if (args->flags != 0) -@@ -964,7 +964,7 @@ int vc4_get_tiling_ioctl(struct drm_devi +@@ -967,7 +967,7 @@ int vc4_get_tiling_ioctl(struct drm_devi struct drm_gem_object *gem_obj; struct vc4_bo *bo; @@ -135,7 +135,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; if (args->flags != 0 || args->modifier != 0) -@@ -1007,7 +1007,7 @@ int vc4_bo_cache_init(struct drm_device +@@ -1010,7 +1010,7 @@ int vc4_bo_cache_init(struct drm_device int ret; int i; @@ -144,7 +144,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; /* Create the initial set of BO labels that the kernel will -@@ -1071,7 +1071,7 @@ int vc4_label_bo_ioctl(struct drm_device +@@ -1074,7 +1074,7 @@ int vc4_label_bo_ioctl(struct drm_device struct drm_gem_object *gem_obj; int ret = 0, label; @@ -213,7 +213,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> driver = &vc4_drm_driver; --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c -@@ -76,7 +76,7 @@ vc4_get_hang_state_ioctl(struct drm_devi +@@ -77,7 +77,7 @@ vc4_get_hang_state_ioctl(struct drm_devi u32 i; int ret = 0; @@ -222,7 +222,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; if (!vc4->v3d) { -@@ -389,7 +389,7 @@ vc4_wait_for_seqno(struct drm_device *de +@@ -392,7 +392,7 @@ vc4_wait_for_seqno(struct drm_device *de unsigned long timeout_expire; DEFINE_WAIT(wait); @@ -231,7 +231,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; if (vc4->finished_seqno >= seqno) -@@ -474,7 +474,7 @@ vc4_submit_next_bin_job(struct drm_devic +@@ -477,7 +477,7 @@ vc4_submit_next_bin_job(struct drm_devic struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_exec_info *exec; @@ -240,7 +240,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return; again: -@@ -522,7 +522,7 @@ vc4_submit_next_render_job(struct drm_de +@@ -525,7 +525,7 @@ vc4_submit_next_render_job(struct drm_de if (!exec) return; @@ -249,7 +249,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return; /* A previous RCL may have written to one of our textures, and -@@ -543,7 +543,7 @@ vc4_move_job_to_render(struct drm_device +@@ -546,7 +546,7 @@ vc4_move_job_to_render(struct drm_device struct vc4_dev *vc4 = to_vc4_dev(dev); bool was_empty = list_empty(&vc4->render_job_list); @@ -258,7 +258,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return; list_move_tail(&exec->head, &vc4->render_job_list); -@@ -970,7 +970,7 @@ vc4_job_handle_completed(struct vc4_dev +@@ -973,7 +973,7 @@ vc4_job_handle_completed(struct vc4_dev unsigned long irqflags; struct vc4_seqno_cb *cb, *cb_temp; @@ -267,7 +267,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return; spin_lock_irqsave(&vc4->job_lock, irqflags); -@@ -1009,7 +1009,7 @@ int vc4_queue_seqno_cb(struct drm_device +@@ -1012,7 +1012,7 @@ int vc4_queue_seqno_cb(struct drm_device struct vc4_dev *vc4 = to_vc4_dev(dev); unsigned long irqflags; @@ -276,7 +276,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; cb->func = func; -@@ -1065,7 +1065,7 @@ vc4_wait_seqno_ioctl(struct drm_device * +@@ -1068,7 +1068,7 @@ vc4_wait_seqno_ioctl(struct drm_device * struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_vc4_wait_seqno *args = data; @@ -285,7 +285,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; return vc4_wait_for_seqno_ioctl_helper(dev, args->seqno, -@@ -1082,7 +1082,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev +@@ -1085,7 +1085,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev struct drm_gem_object *gem_obj; struct vc4_bo *bo; @@ -294,7 +294,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; if (args->pad != 0) -@@ -1131,7 +1131,7 @@ vc4_submit_cl_ioctl(struct drm_device *d +@@ -1134,7 +1134,7 @@ vc4_submit_cl_ioctl(struct drm_device *d args->shader_rec_size, args->bo_handle_count); @@ -303,7 +303,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; if (!vc4->v3d) { -@@ -1267,7 +1267,7 @@ int vc4_gem_init(struct drm_device *dev) +@@ -1270,7 +1270,7 @@ int vc4_gem_init(struct drm_device *dev) struct vc4_dev *vc4 = to_vc4_dev(dev); int ret; @@ -312,7 +312,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> return -ENODEV; vc4->dma_fence_context = dma_fence_context_alloc(1); -@@ -1326,7 +1326,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev +@@ -1329,7 +1329,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev struct vc4_bo *bo; int ret; diff --git a/target/linux/bcm27xx/patches-6.12/950-0604-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch b/target/linux/bcm27xx/patches-6.12/950-0604-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch index 7efe53f6dc..efac16bb7b 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0604-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0604-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch @@ -76,7 +76,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> VC4_HD_VID_CTL_ENABLE | VC4_HD_VID_CTL_CLRRGB | VC4_HD_VID_CTL_UNDERFLOW_ENABLE | -@@ -3121,6 +3134,7 @@ static int vc4_hdmi_runtime_suspend(stru +@@ -3127,6 +3140,7 @@ static int vc4_hdmi_runtime_suspend(stru { struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev); @@ -84,7 +84,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> clk_disable_unprepare(vc4_hdmi->hsm_clock); return 0; -@@ -3153,6 +3167,10 @@ static int vc4_hdmi_runtime_resume(struc +@@ -3159,6 +3173,10 @@ static int vc4_hdmi_runtime_resume(struc goto err_disable_clk; } @@ -95,7 +95,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> if (vc4_hdmi->variant->reset) vc4_hdmi->variant->reset(vc4_hdmi); -@@ -3273,7 +3291,9 @@ static int vc4_hdmi_bind(struct device * +@@ -3279,7 +3297,9 @@ static int vc4_hdmi_bind(struct device * return ret; if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || @@ -106,7 +106,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> HDMI_READ(HDMI_VID_CTL) & VC4_HD_VID_CTL_ENABLE) { clk_prepare_enable(vc4_hdmi->pixel_clock); clk_prepare_enable(vc4_hdmi->hsm_clock); -@@ -3407,10 +3427,66 @@ static const struct vc4_hdmi_variant bcm +@@ -3413,10 +3433,66 @@ static const struct vc4_hdmi_variant bcm .hp_detect = vc5_hdmi_hp_detect, }; diff --git a/target/linux/bcm27xx/patches-6.12/950-0644-vc4-Add-jack-detection-to-HDMI-audio-driver.patch b/target/linux/bcm27xx/patches-6.12/950-0644-vc4-Add-jack-detection-to-HDMI-audio-driver.patch index 6de0ebfd67..db24a98b8e 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0644-vc4-Add-jack-detection-to-HDMI-audio-driver.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0644-vc4-Add-jack-detection-to-HDMI-audio-driver.patch @@ -115,7 +115,7 @@ Signed-off-by: David Turner <david.turner@raspberrypi.com> card->dai_link = dai_link; card->num_links = 1; card->name = vc4_hdmi->variant->card_name; -@@ -3234,6 +3280,8 @@ static int vc4_hdmi_bind(struct device * +@@ -3240,6 +3286,8 @@ static int vc4_hdmi_bind(struct device * if (ret) return ret; @@ -124,7 +124,7 @@ Signed-off-by: David Turner <david.turner@raspberrypi.com> spin_lock_init(&vc4_hdmi->hw_lock); INIT_DELAYED_WORK(&vc4_hdmi->scrambling_work, vc4_hdmi_scrambling_wq); -@@ -3346,8 +3394,16 @@ err_put_runtime_pm: +@@ -3352,8 +3400,16 @@ err_put_runtime_pm: return ret; } diff --git a/target/linux/bcm27xx/patches-6.12/950-0661-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch b/target/linux/bcm27xx/patches-6.12/950-0661-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch index 442c499359..9c01813c42 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0661-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0661-drm-vc4-Remove-request-for-min-clocks-when-hdmi-outp.patch @@ -39,7 +39,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock); clk_disable_unprepare(vc4_hdmi->pixel_clock); -@@ -3219,6 +3221,8 @@ static int vc4_hdmi_runtime_suspend(stru +@@ -3225,6 +3227,8 @@ static int vc4_hdmi_runtime_suspend(stru struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev); clk_disable_unprepare(vc4_hdmi->audio_clock); diff --git a/target/linux/bcm27xx/patches-6.12/950-0662-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch b/target/linux/bcm27xx/patches-6.12/950-0662-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch index 06902e85d0..bfad6e03e4 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0662-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0662-drm-vc4-Disable-the-2pixel-clock-odd-timings-workaro.patch @@ -157,7 +157,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> if (mode->flags & DRM_MODE_FLAG_DBLCLK) { /* Only try to fixup DBLCLK modes to get 480i and 576i * working. -@@ -3481,6 +3483,7 @@ static const struct vc4_hdmi_variant bcm +@@ -3487,6 +3489,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_CK, }, .unsupported_odd_h_timings = true, @@ -165,7 +165,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> .external_irq_controller = true, .init_resources = vc5_hdmi_init_resources, -@@ -3510,6 +3513,7 @@ static const struct vc4_hdmi_variant bcm +@@ -3516,6 +3519,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_2, }, .unsupported_odd_h_timings = true, @@ -173,7 +173,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> .external_irq_controller = true, .init_resources = vc5_hdmi_init_resources, -@@ -3539,6 +3543,7 @@ static const struct vc4_hdmi_variant bcm +@@ -3545,6 +3549,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_CK, }, .unsupported_odd_h_timings = false, @@ -181,7 +181,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> .external_irq_controller = true, .init_resources = vc5_hdmi_init_resources, -@@ -3566,6 +3571,7 @@ static const struct vc4_hdmi_variant bcm +@@ -3572,6 +3577,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_CK, }, .unsupported_odd_h_timings = false, diff --git a/target/linux/bcm27xx/patches-6.12/950-0824-drm-vc4-Correct-one-logging-message-that-got-promote.patch b/target/linux/bcm27xx/patches-6.12/950-0824-drm-vc4-Correct-one-logging-message-that-got-promote.patch index 8819b86ff4..1d6a490d9c 100644 --- a/target/linux/bcm27xx/patches-6.12/950-0824-drm-vc4-Correct-one-logging-message-that-got-promote.patch +++ b/target/linux/bcm27xx/patches-6.12/950-0824-drm-vc4-Correct-one-logging-message-that-got-promote.patch @@ -18,7 +18,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -3351,7 +3351,7 @@ static int vc4_hdmi_bind(struct device * +@@ -3357,7 +3357,7 @@ static int vc4_hdmi_bind(struct device * vc4_hdmi->ddc = of_find_i2c_adapter_by_node(ddc_node); of_node_put(ddc_node); if (!vc4_hdmi->ddc) { diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12 index d03f5fe689..b3f44bee1e 100644 --- a/target/linux/generic/kernel-6.12 +++ b/target/linux/generic/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .82 -LINUX_KERNEL_HASH-6.12.82 = 0e570b05cd73981bb4a5bcf0e03751d4f0e2ac776c6d4fdcc2366bed3e0f19a9 +LINUX_VERSION-6.12 = .83 +LINUX_KERNEL_HASH-6.12.83 = 39e3172cd1dfa526d353b603e6388db2ab122bbf6a08e05930559a832adcdf31 diff --git a/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch b/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch index 8fb99d3d7c..bdb28abd7c 100644 --- a/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch +++ b/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch @@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -733,10 +733,64 @@ static int sfp_i2c_write(struct sfp *sfp +@@ -749,10 +749,64 @@ static int sfp_i2c_write(struct sfp *sfp return ret == ARRAY_SIZE(msgs) ? len : 0; } @@ -77,7 +77,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> sfp->i2c = i2c; sfp->read = sfp_i2c_read; -@@ -768,6 +822,29 @@ static int sfp_i2c_mdiobus_create(struct +@@ -784,6 +838,29 @@ static int sfp_i2c_mdiobus_create(struct return 0; } @@ -107,7 +107,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> static void sfp_i2c_mdiobus_destroy(struct sfp *sfp) { mdiobus_unregister(sfp->i2c_mii); -@@ -1942,9 +2019,15 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1958,9 +2035,15 @@ static void sfp_sm_fault(struct sfp *sfp static int sfp_sm_add_mdio_bus(struct sfp *sfp) { |