Skip to content

Commit c6338f1

Browse files
authored
Update RPi kernel to 6.12.20 (#4036)
* Update RPi kernel to 6.12.20 Update to latest stable RPi kernel and remove unnecessary 6.6.y kernel config fragments. * Refresh RPi and Yellow patches Rebase all patches on 6.12.20, remove patches that are already present upstream. * Update Yellow device trees for 6.12.20 Upstream changes broke our downstream device trees. While the CM4 fix was trivial, there were more changes in the CM5 device tree due to adaptation to upstream code. To simplify future maintenance, DTS was refactored to reuse CM5 DTS include and override only what's necessary. * Bump buildroot to update to matching package/rpi-firmware * buildroot ead21eb6d2...cd82256125 (1): > package/rpi-firmware: bump version to f49a396 (1.20250326)
1 parent b1a3106 commit c6338f1

File tree

44 files changed

+997
-1072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+997
-1072
lines changed

Documentation/kernel.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
| Board | Version |
55
|-------|---------|
66
| Open Virtual Appliance | 6.12.24 |
7-
| Raspberry Pi | 6.6.74 |
8-
| Raspberry Pi 0-W | 6.6.74 |
9-
| Raspberry Pi 2 | 6.6.74 |
10-
| Raspberry Pi 3 | 6.6.74 |
11-
| Raspberry Pi 4 | 6.6.74 |
12-
| Raspberry Pi 5 | 6.6.74 |
13-
| Home Assistant Yellow | 6.6.74 |
7+
| Raspberry Pi | 6.12.20 |
8+
| Raspberry Pi 0-W | 6.12.20 |
9+
| Raspberry Pi 2 | 6.12.20 |
10+
| Raspberry Pi 3 | 6.12.20 |
11+
| Raspberry Pi 4 | 6.12.20 |
12+
| Raspberry Pi 5 | 6.12.20 |
13+
| Home Assistant Yellow | 6.12.20 |
1414
| Home Assistant Green | 6.12.24 |
1515
| Tinker Board | 6.12.24 |
1616
| ODROID-C2 | 6.12.24 |

buildroot-external/board/raspberrypi/patches/linux/0001-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e2f2644f306f44e65bb8082bac3c26cb5e699664 Mon Sep 17 00:00:00 2001
1+
From cc54354a5cd983d27ba3e800cfdf2d8cf70b812f Mon Sep 17 00:00:00 2001
22
From: Pascal Vizeli <[email protected]>
33
Date: Tue, 2 Jun 2020 21:20:08 +0000
44
Subject: [PATCH] ARM: dts: bcm283x: add compatible picked up by U-Boot
@@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner <[email protected]>
1616
2 files changed, 5 insertions(+), 5 deletions(-)
1717

1818
diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
19-
index 4a379a14966d8..30f6ccdcef178 100644
19+
index bb137d8da1a82..cd03157437780 100644
2020
--- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi
2121
+++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
2222
@@ -128,7 +128,7 @@ rng@7e104000 {
@@ -56,7 +56,7 @@ index 4a379a14966d8..30f6ccdcef178 100644
5656
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
5757
clocks = <&clocks BCM2835_CLOCK_UART>,
5858
diff --git a/arch/arm/boot/dts/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
59-
index 2ca8a2505a4db..6f91c85677d89 100644
59+
index 562c4e9d08cc0..d10e441b0df53 100644
6060
--- a/arch/arm/boot/dts/broadcom/bcm283x.dtsi
6161
+++ b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
6262
@@ -302,7 +302,7 @@ uart1_ctsrts_gpio42: uart1-ctsrts-gpio42 {

buildroot-external/board/raspberrypi/patches/linux/0002-USB-storage-Increase-maximum-length-of-the-quirks-st.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8b7bfad7fda35949975f359c7e207bc57bc765db Mon Sep 17 00:00:00 2001
1+
From 1c96ac8457c0131f256fe8208946dae548f28d67 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <[email protected]>
33
Date: Mon, 15 Apr 2024 14:07:34 +0200
44
Subject: [PATCH] USB: storage: Increase maximum length of the quirks string
@@ -16,12 +16,12 @@ Signed-off-by: Jan Čermák <[email protected]>
1616
1 file changed, 1 insertion(+), 1 deletion(-)
1717

1818
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
19-
index 7b36a3334fb34..9691e6b9fe5aa 100644
19+
index d36f3b6992bbd..f976f074350bc 100644
2020
--- a/drivers/usb/storage/usb.c
2121
+++ b/drivers/usb/storage/usb.c
22-
@@ -71,7 +71,7 @@ static unsigned int delay_use = 1;
23-
module_param(delay_use, uint, S_IRUGO | S_IWUSR);
24-
MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
22+
@@ -165,7 +165,7 @@ static const struct kernel_param_ops delay_use_ops = {
23+
module_param_cb(delay_use, &delay_use_ops, &delay_use, 0644);
24+
MODULE_PARM_DESC(delay_use, "time to delay before using a new device");
2525

2626
-static char quirks[128];
2727
+static char quirks[256];

buildroot-external/board/raspberrypi/patches/linux/0003-dts-bcm2712-rpi-Disable-CQE-for-CM5-eMMC-to-work-aro.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ec7a5ea27ef759c67225b1616e4266bcff0d7fb4 Mon Sep 17 00:00:00 2001
1+
From 7d8fa172abf09d8c93d53a4468c74888a5f3db24 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <[email protected]>
33
Date: Tue, 14 Jan 2025 18:27:20 +0100
44
Subject: [PATCH] dts: bcm2712-rpi: Disable CQE for CM5 eMMC to work around FS
@@ -18,10 +18,10 @@ Signed-off-by: Jan Čermák <[email protected]>
1818
1 file changed, 1 insertion(+), 1 deletion(-)
1919

2020
diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
21-
index 099d14ecf19a4..d49fc876cccc1 100644
21+
index 94f8d4b789d05..d32ad279914b6 100644
2222
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
2323
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
24-
@@ -339,7 +339,7 @@ &sdio1 {
24+
@@ -297,7 +297,7 @@ &sdio1 {
2525
mmc-hs400-1_8v;
2626
mmc-hs400-enhanced-strobe;
2727
broken-cd;

buildroot-external/board/raspberrypi/patches/linux/0004-ipv6-annotate-data-races-around-cnf.forwarding.patch

Lines changed: 0 additions & 198 deletions
This file was deleted.

buildroot-external/board/raspberrypi/patches/linux/0005-misc-rp1-pio-Error-out-on-incompatible-firmware.patch

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)