diff --git a/Documentation/kernel.md b/Documentation/kernel.md index fb65dd665..549b219f4 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -4,10 +4,10 @@ | Board | Version | |-------|---------| | Open Virtual Appliance | 6.12.77 | -| Raspberry Pi 3 | 6.12.47 | -| Raspberry Pi 4 | 6.12.47 | -| Raspberry Pi 5 | 6.12.47 | -| Home Assistant Yellow | 6.12.47 | +| Raspberry Pi 3 | 6.12.75 | +| Raspberry Pi 4 | 6.12.75 | +| Raspberry Pi 5 | 6.12.75 | +| Home Assistant Yellow | 6.12.75 | | Home Assistant Green | 6.12.77 | | ODROID-C2 | 6.12.77 | | ODROID-C4 | 6.12.77 | diff --git a/buildroot b/buildroot index d9cb724f0..be34a8185 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit d9cb724f061e1878f938a251fcea698aa9f4d43b +Subproject commit be34a818509d695ff2f5493076f97b09197b1535 diff --git a/buildroot-external/board/raspberrypi/patches/linux/0001-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch b/buildroot-external/board/raspberrypi/patches/linux/0001-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch index 8ab79c792..0cf3e6c11 100644 --- a/buildroot-external/board/raspberrypi/patches/linux/0001-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch +++ b/buildroot-external/board/raspberrypi/patches/linux/0001-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch @@ -1,4 +1,4 @@ -From cc54354a5cd983d27ba3e800cfdf2d8cf70b812f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Tue, 2 Jun 2020 21:20:08 +0000 Subject: [PATCH] ARM: dts: bcm283x: add compatible picked up by U-Boot diff --git a/buildroot-external/board/raspberrypi/patches/linux/0002-USB-storage-Increase-maximum-length-of-the-quirks-st.patch b/buildroot-external/board/raspberrypi/patches/linux/0002-USB-storage-Increase-maximum-length-of-the-quirks-st.patch index 0fe0262a3..3d6496d4c 100644 --- a/buildroot-external/board/raspberrypi/patches/linux/0002-USB-storage-Increase-maximum-length-of-the-quirks-st.patch +++ b/buildroot-external/board/raspberrypi/patches/linux/0002-USB-storage-Increase-maximum-length-of-the-quirks-st.patch @@ -1,4 +1,4 @@ -From 1c96ac8457c0131f256fe8208946dae548f28d67 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Mon, 15 Apr 2024 14:07:34 +0200 Subject: [PATCH] USB: storage: Increase maximum length of the quirks string diff --git a/buildroot-external/board/raspberrypi/patches/linux/0003-dts-bcm2712-rpi-Disable-CQE-for-CM5-eMMC-to-work-aro.patch b/buildroot-external/board/raspberrypi/patches/linux/0003-dts-bcm2712-rpi-Disable-CQE-for-CM5-eMMC-to-work-aro.patch index b85e99b60..a0e9652f8 100644 --- a/buildroot-external/board/raspberrypi/patches/linux/0003-dts-bcm2712-rpi-Disable-CQE-for-CM5-eMMC-to-work-aro.patch +++ b/buildroot-external/board/raspberrypi/patches/linux/0003-dts-bcm2712-rpi-Disable-CQE-for-CM5-eMMC-to-work-aro.patch @@ -1,4 +1,4 @@ -From 7d8fa172abf09d8c93d53a4468c74888a5f3db24 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 14 Jan 2025 18:27:20 +0100 Subject: [PATCH] dts: bcm2712-rpi: Disable CQE for CM5 eMMC to work around FS @@ -18,10 +18,10 @@ Signed-off-by: Jan Čermák 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi -index 94f8d4b789d05..d32ad279914b6 100644 +index e35d3abba20bc..4ef2f264f9b52 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi -@@ -297,7 +297,7 @@ &sdio1 { +@@ -301,7 +301,7 @@ &sdio1 { mmc-hs400-1_8v; mmc-hs400-enhanced-strobe; broken-cd; diff --git a/buildroot-external/board/raspberrypi/patches/linux/0004-ARM-dts-add-fallback-compatibles-for-RPi-PL011-UARTs.patch b/buildroot-external/board/raspberrypi/patches/linux/0004-ARM-dts-add-fallback-compatibles-for-RPi-PL011-UARTs.patch new file mode 100644 index 000000000..56b41bd71 --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/linux/0004-ARM-dts-add-fallback-compatibles-for-RPi-PL011-UARTs.patch @@ -0,0 +1,86 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= +Date: Thu, 19 Mar 2026 12:33:59 +0100 +Subject: [PATCH] ARM: dts: add fallback compatibles for RPi PL011 UARTs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In e165d4f5e96603d19a08983576e61cf09d42bac3 the compatibles for the PL011 UARTs +were changed to downstream pl011-axi string, overriding the list of compatibles +from upper DTS, used especially by U-Boot. Extend the list with the extra +compatibles indicated previously, allowing U-Boot to use the desired driver +while keeping the benefits of the PL011 platform driver in Linux. + +Signed-off-by: Jan Čermák +--- + arch/arm/boot/dts/broadcom/bcm270x.dtsi | 2 +- + arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi | 10 +++++----- + arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/boot/dts/broadcom/bcm270x.dtsi b/arch/arm/boot/dts/broadcom/bcm270x.dtsi +index ccc203e3131fa..dcbe0ca57d286 100644 +--- a/arch/arm/boot/dts/broadcom/bcm270x.dtsi ++++ b/arch/arm/boot/dts/broadcom/bcm270x.dtsi +@@ -239,7 +239,7 @@ dpi_16bit_cpadhi_gpio2: dpi_16bit_cpadhi_gpio2 { + }; + + &uart0 { +- compatible = "arm,pl011-axi"; ++ compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + /* Enable CTS bug workaround */ + cts-event-workaround; + }; +diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi +index 8cc1ef5bf6d0c..c9429e7cb86bf 100644 +--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi ++++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi +@@ -510,29 +510,29 @@ &spi6 { + }; + + &uart0 { +- compatible = "arm,pl011-axi"; ++ compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + }; + + &uart2 { +- compatible = "arm,pl011-axi"; ++ compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + pinctrl-0 = <&uart2_pins>; + pinctrl-names = "default"; + }; + + &uart3 { +- compatible = "arm,pl011-axi"; ++ compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + pinctrl-0 = <&uart3_pins>; + pinctrl-names = "default"; + }; + + &uart4 { +- compatible = "arm,pl011-axi"; ++ compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + pinctrl-0 = <&uart4_pins>; + pinctrl-names = "default"; + }; + + &uart5 { +- compatible = "arm,pl011-axi"; ++ compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + pinctrl-0 = <&uart5_pins>; + pinctrl-names = "default"; + }; +diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi +index 98b0e9452e367..f03b4c2bf66b4 100644 +--- a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi ++++ b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi +@@ -430,7 +430,7 @@ &gicv2 { + }; + + &uart10 { +- compatible = "arm,pl011-axi"; ++ compatible = "arm,pl011-axi", "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + }; + + &aon_intr { diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index a34505194..dfbc4187a 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/89050b1059997d38d55462b323b099a6436dc10d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 75297ac50..108ae5c07 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/89050b1059997d38d55462b323b099a6436dc10d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/rpi5_64_defconfig b/buildroot-external/configs/rpi5_64_defconfig index ba1d667db..1ccd0301d 100644 --- a/buildroot-external/configs/rpi5_64_defconfig +++ b/buildroot-external/configs/rpi5_64_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi5-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi5-64/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/89050b1059997d38d55462b323b099a6436dc10d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index 4e42c3b56..638328184 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/89050b1059997d38d55462b323b099a6436dc10d.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y