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)
2025-07-19 02:56:34 +00:00 · 2025-04-23 19:01:50 +02:00 · 2025-04-23 19:01:50 +02:00 · c6338f1576
commit c6338f1576
parent b1a3106907
44 changed files with 997 additions and 1072 deletions
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@ -4,13 +4,13 @@
 | Board | Version |
 |-------|---------|
 | Open Virtual Appliance | 6.12.24 |
-| Raspberry Pi | 6.6.74 |
-| Raspberry Pi 0-W | 6.6.74 |
-| Raspberry Pi 2 | 6.6.74 |
-| Raspberry Pi 3 | 6.6.74 |
-| Raspberry Pi 4 | 6.6.74 |
-| Raspberry Pi 5 | 6.6.74 |
-| Home Assistant Yellow | 6.6.74 |
+| Raspberry Pi | 6.12.20 |
+| Raspberry Pi 0-W | 6.12.20 |
+| Raspberry Pi 2 | 6.12.20 |
+| Raspberry Pi 3 | 6.12.20 |
+| Raspberry Pi 4 | 6.12.20 |
+| Raspberry Pi 5 | 6.12.20 |
+| Home Assistant Yellow | 6.12.20 |
 | Home Assistant Green | 6.12.24 |
 | Tinker Board | 6.12.24 |
 | ODROID-C2 | 6.12.24 |
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ead21eb6d24055317b7281b1a8e7d1d6e809313b
+Subproject commit cd82256125da81f074ee057b2ea9d636cd52d968
--- 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 e2f2644f306f44e65bb8082bac3c26cb5e699664 Mon Sep 17 00:00:00 2001
+From cc54354a5cd983d27ba3e800cfdf2d8cf70b812f Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 2 Jun 2020 21:20:08 +0000
 Subject: [PATCH] ARM: dts: bcm283x: add compatible picked up by U-Boot
@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
 2 files changed, 5 insertions(+), 5 deletions(-)

 diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
-index 4a379a14966d8..30f6ccdcef178 100644
+index bb137d8da1a82..cd03157437780 100644
 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
@@ -128,7 +128,7 @@ rng@7e104000 {
@ -56,7 +56,7 @@ index 4a379a14966d8..30f6ccdcef178 100644
 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clocks BCM2835_CLOCK_UART>,
 diff --git a/arch/arm/boot/dts/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
-index 2ca8a2505a4db..6f91c85677d89 100644
+index 562c4e9d08cc0..d10e441b0df53 100644
 --- a/arch/arm/boot/dts/broadcom/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/broadcom/bcm283x.dtsi
@@ -302,7 +302,7 @@ uart1_ctsrts_gpio42: uart1-ctsrts-gpio42 {
--- 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 8b7bfad7fda35949975f359c7e207bc57bc765db Mon Sep 17 00:00:00 2001
+From 1c96ac8457c0131f256fe8208946dae548f28d67 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Mon, 15 Apr 2024 14:07:34 +0200
 Subject: [PATCH] USB: storage: Increase maximum length of the quirks string
@ -16,12 +16,12 @@ Signed-off-by: Jan Čermák <sairon@sairon.cz>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
-index 7b36a3334fb34..9691e6b9fe5aa 100644
+index d36f3b6992bbd..f976f074350bc 100644
 --- a/drivers/usb/storage/usb.c
 +++ b/drivers/usb/storage/usb.c
-@@ -71,7 +71,7 @@ static unsigned int delay_use = 1;
- module_param(delay_use, uint, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
+@@ -165,7 +165,7 @@ static const struct kernel_param_ops delay_use_ops = {
+ module_param_cb(delay_use, &delay_use_ops, &delay_use, 0644);
+ MODULE_PARM_DESC(delay_use, "time to delay before using a new device");
 
 -static char quirks[128];
 +static char quirks[256];
--- 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 ec7a5ea27ef759c67225b1616e4266bcff0d7fb4 Mon Sep 17 00:00:00 2001
+From 7d8fa172abf09d8c93d53a4468c74888a5f3db24 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 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 <sairon@sairon.cz>
 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 099d14ecf19a4..d49fc876cccc1 100644
+index 94f8d4b789d05..d32ad279914b6 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
 +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
-@@ -339,7 +339,7 @@ &sdio1 {
+@@ -297,7 +297,7 @@ &sdio1 {
 	mmc-hs400-1_8v;
 	mmc-hs400-enhanced-strobe;
 	broken-cd;
--- a/buildroot-external/board/raspberrypi/patches/linux/0004-ipv6-annotate-data-races-around-cnf.forwarding.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0004-ipv6-annotate-data-races-around-cnf.forwarding.patch
@ -1,198 +0,0 @@
-From 93ddda43441baefd98267c671ce2ec7e5527906b Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Wed, 28 Feb 2024 13:54:30 +0000
-Subject: [PATCH] ipv6: annotate data-races around cnf.forwarding
-
-idev->cnf.forwarding and net->ipv6.devconf_all->forwarding
-might be read locklessly, add appropriate READ_ONCE()
-and WRITE_ONCE() annotations.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Reviewed-by: Jiri Pirko <jiri@nvidia.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
---
- drivers/net/usb/cdc_mbim.c |  2 +-
- include/net/ipv6.h         |  8 +++++---
- net/core/filter.c          |  2 +-
- net/ipv6/addrconf.c        | 10 ++++++----
- net/ipv6/ip6_output.c      |  2 +-
- net/ipv6/ndisc.c           | 11 ++++++-----
- net/ipv6/route.c           |  4 ++--
- 7 files changed, 22 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
-index cd4083e0b3b9e..e13e4920ee9b2 100644
--- a/drivers/net/usb/cdc_mbim.c
-+++ b/drivers/net/usb/cdc_mbim.c
-@@ -339,7 +339,7 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *buf, u16 tci)
- 	in6_dev = in6_dev_get(netdev);
- 	if (!in6_dev)
- 		goto out;
-	is_router = !!in6_dev->cnf.forwarding;
-+	is_router = !!READ_ONCE(in6_dev->cnf.forwarding);
- 	in6_dev_put(in6_dev);
- 
- 	/* ipv6_stub != NULL if in6_dev_get returned an inet6_dev */
-diff --git a/include/net/ipv6.h b/include/net/ipv6.h
-index c6932d1a3fa80..0185ca1617c1a 100644
--- a/include/net/ipv6.h
-+++ b/include/net/ipv6.h
-@@ -534,13 +534,15 @@ static inline int ipv6_hopopt_jumbo_remove(struct sk_buff *skb)
- 	return 0;
- }
- 
-static inline bool ipv6_accept_ra(struct inet6_dev *idev)
-+static inline bool ipv6_accept_ra(const struct inet6_dev *idev)
- {
-+	s32 accept_ra = READ_ONCE(idev->cnf.accept_ra);
-+
- 	/* If forwarding is enabled, RA are not accepted unless the special
- 	 * hybrid mode (accept_ra=2) is enabled.
- 	 */
-	return idev->cnf.forwarding ? idev->cnf.accept_ra == 2 :
-	    idev->cnf.accept_ra;
-+	return READ_ONCE(idev->cnf.forwarding) ? accept_ra == 2 :
-+		accept_ra;
- }
- 
- #define IPV6_FRAG_HIGH_THRESH	(4 * 1024*1024)	/* 4194304 */
-diff --git a/net/core/filter.c b/net/core/filter.c
-index 5881944f1681c..4288f45ff54ce 100644
--- a/net/core/filter.c
-+++ b/net/core/filter.c
-@@ -6021,7 +6021,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
- 		return -ENODEV;
- 
- 	idev = __in6_dev_get_safely(dev);
-	if (unlikely(!idev || !idev->cnf.forwarding))
-+	if (unlikely(!idev || !READ_ONCE(idev->cnf.forwarding)))
- 		return BPF_FIB_LKUP_RET_FWD_DISABLED;
- 
- 	if (flags & BPF_FIB_LOOKUP_OUTPUT) {
-diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 8360939acf85a..12c0b1e85cea1 100644
--- a/net/ipv6/addrconf.c
-+++ b/net/ipv6/addrconf.c
-@@ -547,7 +547,8 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
- 		goto out;
- 
- 	if ((all || type == NETCONFA_FORWARDING) &&
-	    nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)
-+	    nla_put_s32(skb, NETCONFA_FORWARDING,
-+			READ_ONCE(devconf->forwarding)) < 0)
- 		goto nla_put_failure;
- #ifdef CONFIG_IPV6_MROUTE
- 	if ((all || type == NETCONFA_MC_FORWARDING) &&
-@@ -865,7 +866,8 @@ static void addrconf_forward_change(struct net *net, __s32 newf)
- 		idev = __in6_dev_get(dev);
- 		if (idev) {
- 			int changed = (!idev->cnf.forwarding) ^ (!newf);
-			idev->cnf.forwarding = newf;
-+
-+			WRITE_ONCE(idev->cnf.forwarding, newf);
- 			if (changed)
- 				dev_forward_change(idev);
- 		}
-@@ -882,7 +884,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)
- 
- 	net = (struct net *)table->extra2;
- 	old = *p;
-	*p = newf;
-+	WRITE_ONCE(*p, newf);
- 
- 	if (p == &net->ipv6.devconf_dflt->forwarding) {
- 		if ((!newf) ^ (!old))
-@@ -897,7 +899,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)
- 	if (p == &net->ipv6.devconf_all->forwarding) {
- 		int old_dflt = net->ipv6.devconf_dflt->forwarding;
- 
-		net->ipv6.devconf_dflt->forwarding = newf;
-+		WRITE_ONCE(net->ipv6.devconf_dflt->forwarding, newf);
- 		if ((!newf) ^ (!old_dflt))
- 			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,
- 						     NETCONFA_FORWARDING,
-diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
-index 2341a4373bb94..46c0dfa8c6f88 100644
--- a/net/ipv6/ip6_output.c
-+++ b/net/ipv6/ip6_output.c
-@@ -508,7 +508,7 @@ int ip6_forward(struct sk_buff *skb)
- 	u32 mtu;
- 
- 	idev = __in6_dev_get_safely(dev_get_by_index_rcu(net, IP6CB(skb)->iif));
-	if (net->ipv6.devconf_all->forwarding == 0)
-+	if (READ_ONCE(net->ipv6.devconf_all->forwarding) == 0)
- 		goto error;
- 
- 	if (skb->pkt_type != PACKET_HOST)
-diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
-index 23b46b5705c53..bd73484de3818 100644
--- a/net/ipv6/ndisc.c
-+++ b/net/ipv6/ndisc.c
-@@ -905,7 +905,7 @@ static enum skb_drop_reason ndisc_recv_ns(struct sk_buff *skb)
- 		}
- 
- 		if (ipv6_chk_acast_addr(net, dev, &msg->target) ||
-		    (idev->cnf.forwarding &&
-+		    (READ_ONCE(idev->cnf.forwarding) &&
- 		     (net->ipv6.devconf_all->proxy_ndp || idev->cnf.proxy_ndp) &&
- 		     (is_router = pndisc_is_router(&msg->target, dev)) >= 0)) {
- 			if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) &&
-@@ -931,7 +931,7 @@ static enum skb_drop_reason ndisc_recv_ns(struct sk_buff *skb)
- 	}
- 
- 	if (is_router < 0)
-		is_router = idev->cnf.forwarding;
-+		is_router = READ_ONCE(idev->cnf.forwarding);
- 
- 	if (dad) {
- 		ndisc_send_na(dev, &in6addr_linklocal_allnodes, &msg->target,
-@@ -1082,7 +1082,7 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)
- 	 * Note that we don't do a (daddr == all-routers-mcast) check.
- 	 */
- 	new_state = msg->icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE;
-	if (!neigh && lladdr && idev && idev->cnf.forwarding) {
-+	if (!neigh && lladdr && idev && READ_ONCE(idev->cnf.forwarding)) {
- 		if (accept_untracked_na(dev, saddr)) {
- 			neigh = neigh_create(&nd_tbl, &msg->target, dev);
- 			new_state = NUD_STALE;
-@@ -1102,7 +1102,8 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)
- 		 * has already sent a NA to us.
- 		 */
- 		if (lladdr && !memcmp(lladdr, dev->dev_addr, dev->addr_len) &&
-		    net->ipv6.devconf_all->forwarding && net->ipv6.devconf_all->proxy_ndp &&
-+		    READ_ONCE(net->ipv6.devconf_all->forwarding) &&
-+		    net->ipv6.devconf_all->proxy_ndp &&
- 		    pneigh_lookup(&nd_tbl, net, &msg->target, dev, 0)) {
- 			/* XXX: idev->cnf.proxy_ndp */
- 			goto out;
-@@ -1150,7 +1151,7 @@ static enum skb_drop_reason ndisc_recv_rs(struct sk_buff *skb)
- 	}
- 
- 	/* Don't accept RS if we're not in router mode */
-	if (!idev->cnf.forwarding)
-+	if (!READ_ONCE(idev->cnf.forwarding))
- 		goto out;
- 
- 	/*
-diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index fc5c534620253..4a0b12651777b 100644
--- a/net/ipv6/route.c
-+++ b/net/ipv6/route.c
-@@ -2215,7 +2215,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
- 
- 	strict |= flags & RT6_LOOKUP_F_IFACE;
- 	strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE;
-	if (net->ipv6.devconf_all->forwarding == 0)
-+	if (READ_ONCE(net->ipv6.devconf_all->forwarding) == 0)
- 		strict |= RT6_LOOKUP_F_REACHABLE;
- 
- 	rcu_read_lock();
-@@ -4146,7 +4146,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
- 	in6_dev = __in6_dev_get(skb->dev);
- 	if (!in6_dev)
- 		return;
-	if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_redirects)
-+	if (READ_ONCE(in6_dev->cnf.forwarding) || !in6_dev->cnf.accept_redirects)
- 		return;
- 
- 	/* RFC2461 8.1:
--- a/buildroot-external/board/raspberrypi/patches/linux/0005-misc-rp1-pio-Error-out-on-incompatible-firmware.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0005-misc-rp1-pio-Error-out-on-incompatible-firmware.patch
@ -1,44 +0,0 @@
-From ab1d73e2b5101689fcd1737e588119b4fde3a5ff Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 3 Feb 2025 14:44:08 +0000
-Subject: [PATCH] misc: rp1-pio: Error out on incompatible firmware
-
-If the RP1 firmware has reported an error then return that from the PIO
-probe function, otherwise defer the probing.
-
-Link: https://github.com/raspberrypi/linux/issues/6642
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
- drivers/misc/rp1-pio.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/misc/rp1-pio.c b/drivers/misc/rp1-pio.c
-index dbf69279e313d..7e875811509f8 100644
--- a/drivers/misc/rp1-pio.c
-+++ b/drivers/misc/rp1-pio.c
-@@ -1268,8 +1268,10 @@ static int rp1_pio_probe(struct platform_device *pdev)
- 		return dev_err_probe(dev, pdev->id, "alias is missing\n");
- 
- 	fw = devm_rp1_firmware_get(dev, dev->of_node);
-	if (IS_ERR_OR_NULL(fw))
-		return dev_err_probe(dev, -ENOENT, "failed to contact RP1 firmware\n");
-+	if (!fw)
-+		return dev_err_probe(dev, -EPROBE_DEFER, "failed to find RP1 firmware driver\n");
-+	if (IS_ERR(fw))
-+		return dev_err_probe(dev, PTR_ERR(fw), "failed to contact RP1 firmware\n");
- 	ret = rp1_firmware_get_feature(fw, FOURCC_PIO, &op_base, &op_count);
- 	if (ret < 0)
- 		return ret;
-@@ -1346,6 +1348,11 @@ static void rp1_pio_remove(struct platform_device *pdev)
- 
- 	if (g_pio == pio)
- 		g_pio = NULL;
-+
-+	device_destroy(pio->dev_class, pio->dev_num);
-+	cdev_del(&pio->cdev);
-+	class_destroy(pio->dev_class);
-+	unregister_chrdev_region(pio->dev_num, 1);
- }
- 
- static const struct of_device_id rp1_pio_ids[] = {
--- a/buildroot-external/board/raspberrypi/patches/linux/0006-firmware-rp1-Linger-on-firmware-failure.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0006-firmware-rp1-Linger-on-firmware-failure.patch
@ -1,105 +0,0 @@
-From b1bcedb44c54a65a8e494158385eb23199572217 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 3 Feb 2025 14:51:52 +0000
-Subject: [PATCH] firmware: rp1: Linger on firmware failure
-
-To avoid pointless retries, let the probe function succeed if the
-firmware interface is configured correctly but the firmware is
-incompatible. The value of the private drvdata field holds the outcome.
-
-Link: https://github.com/raspberrypi/linux/issues/6642
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
- drivers/firmware/rp1.c | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/firmware/rp1.c b/drivers/firmware/rp1.c
-index 0b0760ca77764..a258452c8b33e 100644
--- a/drivers/firmware/rp1.c
-+++ b/drivers/firmware/rp1.c
-@@ -114,7 +114,8 @@ static void rp1_firmware_delete(struct kref *kref)
- 
- void rp1_firmware_put(struct rp1_firmware *fw)
- {
-	kref_put(&fw->consumers, rp1_firmware_delete);
-+	if (!IS_ERR_OR_NULL(fw))
-+		kref_put(&fw->consumers, rp1_firmware_delete);
- }
- EXPORT_SYMBOL_GPL(rp1_firmware_put);
- 
-@@ -157,7 +158,7 @@ struct rp1_firmware *rp1_firmware_get(struct device_node *client)
- 	const char *match = rp1_firmware_of_match[0].compatible;
- 	struct platform_device *pdev;
- 	struct device_node *fwnode;
-	struct rp1_firmware *fw;
-+	struct rp1_firmware *fw = NULL;
- 
- 	if (!client)
- 		return NULL;
-@@ -166,17 +167,17 @@ struct rp1_firmware *rp1_firmware_get(struct device_node *client)
- 		return NULL;
- 	if (!of_device_is_compatible(fwnode, match)) {
- 		of_node_put(fwnode);
-		return NULL;
-+		return ERR_PTR(-ENXIO);
- 	}
- 
- 	pdev = of_find_device_by_node(fwnode);
- 	of_node_put(fwnode);
- 
- 	if (!pdev)
-		goto err_exit;
-+		return ERR_PTR(-ENXIO);
- 
- 	fw = platform_get_drvdata(pdev);
-	if (!fw)
-+	if (IS_ERR_OR_NULL(fw))
- 		goto err_exit;
- 
- 	if (!kref_get_unless_zero(&fw->consumers))
-@@ -188,7 +189,7 @@ struct rp1_firmware *rp1_firmware_get(struct device_node *client)
- 
- err_exit:
- 	put_device(&pdev->dev);
-	return NULL;
-+	return fw;
- }
- EXPORT_SYMBOL_GPL(rp1_firmware_get);
- 
-@@ -204,8 +205,8 @@ struct rp1_firmware *devm_rp1_firmware_get(struct device *dev, struct device_nod
- 	int ret;
- 
- 	fw = rp1_firmware_get(client);
-	if (!fw)
-		return NULL;
-+	if (IS_ERR_OR_NULL(fw))
-+		return fw;
- 
- 	ret = devm_add_action_or_reset(dev, devm_rp1_firmware_put, fw);
- 	if (ret)
-@@ -270,19 +271,18 @@ static int rp1_firmware_probe(struct platform_device *pdev)
- 	init_completion(&fw->c);
- 	kref_init(&fw->consumers);
- 
-	platform_set_drvdata(pdev, fw);
-
- 	ret = rp1_firmware_message(fw, GET_FIRMWARE_VERSION,
- 				   NULL, 0, &version, sizeof(version));
- 	if (ret == sizeof(version)) {
- 		dev_info(dev, "RP1 Firmware version %08x%08x%08x%08x%08x\n",
- 			 version[0], version[1], version[2], version[3], version[4]);
-		ret = 0;
-	} else if (ret >= 0) {
-		ret = -EIO;
-+		platform_set_drvdata(pdev, fw);
-+	} else {
-+		rp1_firmware_put(fw);
-+		platform_set_drvdata(pdev, ERR_PTR(-ENOENT));
- 	}
- 
-	return ret;
-+	return 0;
- }
- 
- static int rp1_firmware_remove(struct platform_device *pdev)
--- a/buildroot-external/board/raspberrypi/patches/linux/0007-mailbox-rp1-Don-t-claim-channels-in-of_xlate.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0007-mailbox-rp1-Don-t-claim-channels-in-of_xlate.patch
@ -1,32 +0,0 @@
-From 97e6955cef61340165e8ec276084841d335335e9 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 4 Feb 2025 13:18:45 +0000
-Subject: [PATCH] mailbox: rp1: Don't claim channels in of_xlate
-
-The of_xlate method saves the calculated event mask in the con_priv
-field. It also rejects subsequent attempt to use that channel because
-the mask is non-zero, which causes a repeated instantiation of a client
-driver to fail.
-
-The of_xlate method is not meant to be a point of resource acquisition.
-Leave the con_priv initialisation, but drop the test that it was
-previously zero.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
- drivers/mailbox/rp1-mailbox.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/drivers/mailbox/rp1-mailbox.c b/drivers/mailbox/rp1-mailbox.c
-index bf71db1dd9fae..0e8af098b62b2 100644
--- a/drivers/mailbox/rp1-mailbox.c
-+++ b/drivers/mailbox/rp1-mailbox.c
-@@ -133,8 +133,6 @@ static struct mbox_chan *rp1_mbox_xlate(struct mbox_controller *mbox,
- 		return ERR_PTR(-EINVAL);
- 
- 	chan = &mbox->chans[doorbell];
-	if (chan->con_priv)
-		return ERR_PTR(-EBUSY);
- 
- 	chan->con_priv = (void *)(uintptr_t)(1 << doorbell);
- 
--- a/buildroot-external/board/raspberrypi/patches/linux/0008-misc-rp1-pio-Demote-fw-probe-error-to-warning.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0008-misc-rp1-pio-Demote-fw-probe-error-to-warning.patch
@ -1,34 +0,0 @@
-From c8cf0694d8ecd5acaa03c26fc404e66dea9308fd Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 25 Feb 2025 12:16:33 +0000
-Subject: [PATCH] misc: rp1-pio: Demote fw probe error to warning
-
-Support for the RP1 firmware mailbox API is rolling out to Pi 5 EEPROM
-images. For most users, the fact that the PIO is not available is no
-cause for alarm. Change the message to a warning, so that it does not
-appear with "quiet" in cmdline.txt.
-
-Link: https://github.com/raspberrypi/linux/issues/6642
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
- drivers/misc/rp1-pio.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/misc/rp1-pio.c b/drivers/misc/rp1-pio.c
-index 7e875811509f8..a04dc8edcf5b8 100644
--- a/drivers/misc/rp1-pio.c
-+++ b/drivers/misc/rp1-pio.c
-@@ -1270,8 +1270,10 @@ static int rp1_pio_probe(struct platform_device *pdev)
- 	fw = devm_rp1_firmware_get(dev, dev->of_node);
- 	if (!fw)
- 		return dev_err_probe(dev, -EPROBE_DEFER, "failed to find RP1 firmware driver\n");
-	if (IS_ERR(fw))
-		return dev_err_probe(dev, PTR_ERR(fw), "failed to contact RP1 firmware\n");
-+	if (IS_ERR(fw)) {
-+		dev_warn(dev, "failed to contact RP1 firmware\n");
-+		return PTR_ERR(fw);
-+	}
- 	ret = rp1_firmware_get_feature(fw, FOURCC_PIO, &op_base, &op_count);
- 	if (ret < 0)
- 		return ret;
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch
@ -1,4 +1,4 @@
-From 2acf7bc2a2b2a1e575aa6cfe8e8215ff1c0a35ae Mon Sep 17 00:00:00 2001
+From 7305be1ecc97db67b0dc4a34cdf860cd1567f74e Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Apr 2022 14:47:59 +0200
 Subject: [PATCH] ARM: dts: bcm2711: Add device tree for Home Assistant Yellow
@ -609,11 +609,11 @@ index 0000000000000..f92936d7cf16b
 +	};
 +};
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 6dd8659a7d8a8..9d17e60dc33f7 100644
+index 25e4178447368..1388cc1164f96 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -19,6 +19,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
- dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
+@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
+ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm0.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4-ha-yellow.dtb
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch
@ -1,4 +1,4 @@
-From 7bc3b341d90c95dc17d3da0930801006b00d2046 Mon Sep 17 00:00:00 2001
+From bde94ec948ccc701e656eb817d82198cefcde3c1 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:33:09 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio module
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch
@ -1,4 +1,4 @@
-From 65dd5542d4baf35595fc85cd7a9e0aa51dc371cc Mon Sep 17 00:00:00 2001
+From 8672f7e15ffd650d944452699dd1b0b10e1535c1 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:44:23 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux debug UART5
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch
@ -1,4 +1,4 @@
-From 68b50046140a36790b004005b6305820de80520b Mon Sep 17 00:00:00 2001
+From 89522cbb3089abd679a9064b0d6ee14c41790fd0 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:48:48 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: Enable I2C6 by default
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch
@ -1,4 +1,4 @@
-From fef283110d29ff46fba6f1b2d24519128ce8a79b Mon Sep 17 00:00:00 2001
+From 3f94bd6ffd33cbfcdbb4cad51d4fc878bacc4b12 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 17:19:01 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: add I2S audio codec
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch
@ -1,4 +1,4 @@
-From 813ead66c6b09ce9eaab57b5ab6907314226368a Mon Sep 17 00:00:00 2001
+From 43d6b901b3762e4af752efef15f3188668a5b4ca Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 9 Mar 2021 15:02:53 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: enable GPIO keys
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch
@ -1,4 +1,4 @@
-From e738be24b35b8c8df6e5149a64ad9c366c27ba59 Mon Sep 17 00:00:00 2001
+From 2029c766475dec5107d03ffd1a630b281f789d43 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 28 Oct 2021 19:38:04 +0200
 Subject: [PATCH] ARM: dts: bcm2711: yellow: add user LED
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch
@ -1,4 +1,4 @@
-From 1ac9e238e1e9ec9c7cfc8dc84304a6949fe1d958 Mon Sep 17 00:00:00 2001
+From 04192e0855d21ed9c52e734a04ada0216ef7278b Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 12 Nov 2021 17:33:32 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch
@ -1,4 +1,4 @@
-From 124e2b8e4b7ebda8acc488704fe11c5bf5e44bd1 Mon Sep 17 00:00:00 2001
+From d4b16a0df4d853b2cb029470009c6cf1c5fdac2b Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 7 Jan 2022 17:10:00 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: enable USB host mode by default
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0010-ARM-dts-bcm2711-yellow-use-generic-activity-trigger-.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0010-ARM-dts-bcm2711-yellow-use-generic-activity-trigger-.patch
@ -1,4 +1,4 @@
-From 68f9deead3ac327dadd096e004d24a6166f57158 Mon Sep 17 00:00:00 2001
+From b48420ec60d5767c3a70454e90d0d32cbe6a1259 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 27 Apr 2022 20:36:19 +0200
 Subject: [PATCH] ARM: dts: bcm2711: yellow: use generic activity trigger for
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0011-ARM-dts-bcm2711-yellow-use-USB-OTG-mode-by-default.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0011-ARM-dts-bcm2711-yellow-use-USB-OTG-mode-by-default.patch
@ -1,4 +1,4 @@
-From 06b9732139c9dfa46beb4cc56992f2104a528b54 Mon Sep 17 00:00:00 2001
+From 6350fee42ecbe22410df8b19a5757117a5c86593 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 26 Jul 2022 15:53:59 +0200
 Subject: [PATCH] ARM: dts: bcm2711: yellow: use USB OTG mode by default
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0012-ARM-dts-bcm2711-yellow-Add-LED-overrides.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0012-ARM-dts-bcm2711-yellow-Add-LED-overrides.patch
@ -1,4 +1,4 @@
-From d889b7cf38a0ea4990c91380d7c911ed3c9fab5b Mon Sep 17 00:00:00 2001
+From 0f92ffeb7f8edfcb3dc77aa44b5029f4a5186cf5 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Sat, 30 Jul 2022 11:21:31 +0200
 Subject: [PATCH] ARM: dts: bcm2711: yellow: Add LED overrides
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0013-ARM-dts-bcm2711-yellow-use-serial-alias-to-enumerate.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0013-ARM-dts-bcm2711-yellow-use-serial-alias-to-enumerate.patch
@ -1,4 +1,4 @@
-From 614ff7a7904a769dee144ae4cf80e484d8ffade5 Mon Sep 17 00:00:00 2001
+From c2375d4ef4d55523dfc434b555ac55e33c1cc1c7 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 31 May 2023 10:57:43 +0200
 Subject: [PATCH] ARM: dts: bcm2711: yellow: use serial alias to enumerate
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0014-ARM-dts-bcm2711-yellow-Use-mini-UART-for-Bluetooth-b.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0014-ARM-dts-bcm2711-yellow-Use-mini-UART-for-Bluetooth-b.patch
@ -1,4 +1,4 @@
-From 1743e9e6cf20309f9096489930543576a8297c85 Mon Sep 17 00:00:00 2001
+From 12ce243471d8bf7f2b6a738ee2c7b0fe16266cc2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Thu, 16 Nov 2023 12:46:48 +0100
 Subject: [PATCH] ARM: dts: bcm2711: yellow: Use mini-UART for Bluetooth by
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0015-ARM-dts-bcm2711-yellow-Fix-leds-node-referencing-aft.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0015-ARM-dts-bcm2711-yellow-Fix-leds-node-referencing-aft.patch
@ -1,4 +1,4 @@
-From 0f005f5b3182e8ecb745f535a1bfeef31c3bfa5b Mon Sep 17 00:00:00 2001
+From e59c8869089fd28889fa6bb680ebabc2e0db8378 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Tue, 9 Apr 2024 14:18:17 +0200
 Subject: [PATCH] ARM: dts: bcm2711: yellow: Fix leds node referencing after
@ -20,7 +20,7 @@ Signed-off-by: Jan Čermák <sairon@sairon.cz>
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
-index 26033f2d30d0c..627ff93b7d044 100644
+index 26033f2d30d0c..b3d57a53d2224 100644
 --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
 +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
@@ -45,9 +45,14 @@ user {
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0016-ARM-dts-bcm2712-Add-device-tree-for-CM5-on-HA-Yellow.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0016-ARM-dts-bcm2712-Add-device-tree-for-CM5-on-HA-Yellow.patch
@ -1,4 +1,4 @@
-From 15124b1c4c08b408540e020d3f6fdb006ad274cd Mon Sep 17 00:00:00 2001
+From a42b2ff69a6fcecfbcf0a0f469ddbfe01ad48570 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Thu, 3 Oct 2024 13:40:53 +0200
 Subject: [PATCH] ARM: dts: bcm2712: Add device tree for CM5 on HA Yellow
@ -10,10 +10,10 @@ Subject: [PATCH] ARM: dts: bcm2712: Add device tree for CM5 on HA Yellow
 create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-ha-yellow.dts

 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 06ae79a9bcfca..89f4e9aa427a2 100644
+index 1388cc1164f96..058cf8aea9311 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
+@@ -23,6 +23,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm0.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4-ha-yellow.dtb
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0017-ARM-dts-bcm2712-yellow-Sync-sdio1-and-sd_io_1v8_reg-.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0017-ARM-dts-bcm2712-yellow-Sync-sdio1-and-sd_io_1v8_reg-.patch
@ -1,4 +1,4 @@
-From e29e2cfad33afa692f2f727f492dab02d5ff3948 Mon Sep 17 00:00:00 2001
+From 40121453f8be78adccc89273d60ce924fd4889b4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Thu, 21 Nov 2024 14:26:20 +0100
 Subject: [PATCH] ARM: dts: bcm2712: yellow: Sync sdio1 and sd_io_1v8_reg nodes
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0018-ARM-dts-bcm2712-yellow-Disable-SD-SDIO-modes-on-eMMC.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0018-ARM-dts-bcm2712-yellow-Disable-SD-SDIO-modes-on-eMMC.patch
@ -1,4 +1,4 @@
-From 9639a7a0f20cbd4a7b9968f6a3ede4727d96d297 Mon Sep 17 00:00:00 2001
+From 018d79b0f323b710d3843bd7f7fc64f75aedceb7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Thu, 28 Nov 2024 18:05:55 +0100
 Subject: [PATCH] ARM: dts: bcm2712: yellow: Disable SD/SDIO modes on eMMC
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0019-ARM-dts-bcm2712-yellow-Disable-CQE-on-eMMC-interface.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0019-ARM-dts-bcm2712-yellow-Disable-CQE-on-eMMC-interface.patch
@ -1,4 +1,4 @@
-From 0d9aed86fbaf650cf15ea0977e05cee2980ed054 Mon Sep 17 00:00:00 2001
+From cc7be19cb5afc0b02b252ac8af09f920243d7b7c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Mon, 2 Dec 2024 16:07:00 +0100
 Subject: [PATCH] ARM: dts: bcm2712: yellow: Disable CQE on eMMC interface
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0020-ARM-dts-bcm2712-yellow-Disable-rpi_rtc.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0020-ARM-dts-bcm2712-yellow-Disable-rpi_rtc.patch
@ -1,4 +1,4 @@
-From fc558b6a7174e2b5c37936dd8c13ca29e9273472 Mon Sep 17 00:00:00 2001
+From 9cd3f4dba1f692dff9c875dc855b826948f3804d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Mon, 2 Dec 2024 17:22:04 +0100
 Subject: [PATCH] ARM: dts: bcm2712: yellow: Disable rpi_rtc
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0021-ARM-dts-bcm2712-yellow-Simplify-device-tree-sync-wit.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0021-ARM-dts-bcm2712-yellow-Simplify-device-tree-sync-wit.patch
@ -0,0 +1,894 @@
+From 80d97884beb6cf6ed2ca3f3cc17baafb573b60c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Tue, 22 Apr 2025 16:49:17 +0200
+Subject: [PATCH] ARM: dts: bcm2712: yellow: Simplify device tree, sync with
+ rpi-6.12.y
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sync device tree to fix compatibility with includes from 6.12.y branch, remove
+copy-paste nodes and use proper include with overrides.
+
+Clean up aliases and overrides to only contain properties that are relevant to
+Yellow. This also removes aliases i2c4-6 that were present before but those
+don't seem to be used.
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ .../broadcom/bcm2712-rpi-cm5-ha-yellow.dts    | 839 +-----------------
+ 1 file changed, 9 insertions(+), 830 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-ha-yellow.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-ha-yellow.dts
+index ebdeef5f89881..32ada582e50dc 100644
+--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-ha-yellow.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-ha-yellow.dts
+@@ -2,756 +2,9 @@
+ /dts-v1/;
+ 
+ #include <dt-bindings/gpio/gpio.h>
+-#include <dt-bindings/clock/rp1.h>
+ #include <dt-bindings/input/input.h>
+-#include <dt-bindings/interrupt-controller/irq.h>
+-#include <dt-bindings/mfd/rp1.h>
+-#include <dt-bindings/pwm/pwm.h>
+-#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
+ 
+-#define i2c0 _i2c0
+-#define i2c3 _i2c3
+-#define i2c4 _i2c4
+-#define i2c5 _i2c5
+-#define i2c6 _i2c6
+-#define i2c8 _i2c8
+-#define i2s _i2s
+-#define pwm0 _pwm0
+-#define pwm1 _pwm1
+-#define spi0 _spi0
+-#define spi3 _spi3
+-#define spi4 _spi4
+-#define spi5 _spi5
+-#define spi6 _spi6
+-#define uart0 _uart0
+-#define uart2 _uart2
+-#define uart5 _uart5
+-
+-#include "bcm2712.dtsi"
+-
+-#undef i2c0
+-#undef i2c3
+-#undef i2c4
+-#undef i2c5
+-#undef i2c6
+-#undef i2c8
+-#undef i2s
+-#undef pwm0
+-#undef pwm1
+-#undef spi0
+-#undef spi3
+-#undef spi4
+-#undef spi5
+-#undef spi6
+-#undef uart0
+-#undef uart2
+-#undef uart3
+-#undef uart4
+-#undef uart5
+-
+-/ {
+-	compatible = "raspberrypi,5-compute-module-ha-yellow", "raspberrypi,5-compute-module", "brcm,bcm2712";
+-	model = "Raspberry Pi Compute Module 5 on Home Assistant Yellow";
+-
+-	/* Will be filled by the bootloader */
+-	memory@0 {
+-		device_type = "memory";
+-		reg = <0 0 0x28000000>;
+-	};
+-
+-	leds: leds {
+-		compatible = "gpio-leds";
+-
+-		led_pwr: led-pwr {
+-			label = "PWR";
+-			gpios = <&rp1_gpio 44 GPIO_ACTIVE_LOW>;
+-			default-state = "off";
+-			linux,default-trigger = "none";
+-		};
+-
+-		led_act: led-act {
+-			label = "ACT";
+-			gpios = <&gio_aon 9 GPIO_ACTIVE_LOW>;
+-			default-state = "off";
+-			linux,default-trigger = "mmc0";
+-		};
+-	};
+-
+-	sd_io_1v8_reg: sd_io_1v8_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "vdd-sd-io";
+-		regulator-min-microvolt = <1800000>;
+-		regulator-max-microvolt = <1800000>;
+-		regulator-always-on;
+-	};
+-
+-	sd_vcc_reg: sd_vcc_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "vcc-sd";
+-		regulator-min-microvolt = <3300000>;
+-		regulator-max-microvolt = <3300000>;
+-		regulator-boot-on;
+-		enable-active-high;
+-		gpios = <&gio_aon 4 GPIO_ACTIVE_HIGH>;
+-		status = "okay";
+-	};
+-
+-	wl_on_reg: wl_on_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "wl-on-regulator";
+-		regulator-min-microvolt = <3300000>;
+-		regulator-max-microvolt = <3300000>;
+-		pinctrl-0 = <&wl_on_pins>;
+-		pinctrl-names = "default";
+-
+-		gpio = <&gio 28 GPIO_ACTIVE_HIGH>;
+-
+-		startup-delay-us = <150000>;
+-		enable-active-high;
+-	};
+-
+-	clocks: clocks {
+-	};
+-
+-	cam1_clk: cam1_clk {
+-		compatible = "fixed-clock";
+-		#clock-cells = <0>;
+-		status = "disabled";
+-	};
+-
+-	cam0_clk: cam0_clk {
+-		compatible = "fixed-clock";
+-		#clock-cells = <0>;
+-		status = "disabled";
+-	};
+-
+-	cam0_reg: cam0_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam0_reg";
+-		enable-active-high;
+-		status = "okay";
+-		gpio = <&rp1_gpio 34 0>; // CD0_IO0_MICCLK, to CAM_GPIO on connector
+-	};
+-
+-	cam_dummy_reg: cam_dummy_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam-dummy-reg";
+-		status = "okay";
+-	};
+-
+-	dummy: dummy {
+-		// A target for unwanted overlay fragments
+-	};
+-
+-
+-	// A few extra labels to keep overlays happy
+-
+-	i2c0if: i2c0if {};
+-	i2c0mux: i2c0mux {};
+-};
+-
+-rp1_target: &pcie2 {
+-	brcm,enable-mps-rcb;
+-	brcm,vdm-qos-map = <0xbbaa9888>;
+-	aspm-no-l0s;
+-	status = "okay";
+-};
+-
+-// Add some labels to 2712 device
+-
+-// The system UART
+-uart10: &_uart0 { status = "okay"; };
+-
+-// The system SPI for the bootloader EEPROM
+-spi10: &_spi0 { status = "okay"; };
+-
+-i2c_rp1boot: &_i2c3 { };
+-
+-#include "rp1.dtsi"
+-
+-&rp1 {
+-	// PCIe address space layout:
+-	// 00_00000000-00_00xxxxxx = RP1 peripherals
+-	// 10_00000000-1x_xxxxxxxx = up to 64GB system RAM
+-
+-	// outbound access aimed at PCIe 0_00xxxxxx -> RP1 c0_40xxxxxx
+-	// This is the RP1 peripheral space
+-	ranges = <0xc0 0x40000000
+-		  0x02000000 0x00 0x00000000
+-		  0x00 0x00400000>;
+-
+-	dma-ranges =
+-	// inbound RP1 1x_xxxxxxxx -> PCIe 1x_xxxxxxxx
+-		     <0x10 0x00000000
+-		      0x43000000 0x10 0x00000000
+-		      0x10 0x00000000>,
+-
+-	// inbound RP1 c0_40xxxxxx -> PCIe 00_00xxxxxx
+-	// This allows the RP1 DMA controller to address RP1 hardware
+-		     <0xc0 0x40000000
+-		      0x02000000 0x0 0x00000000
+-		      0x0 0x00400000>,
+-
+-	// inbound RP1 0x_xxxxxxxx -> PCIe 1x_xxxxxxxx
+-		     <0x00 0x00000000
+-		      0x02000000 0x10 0x00000000
+-		      0x10 0x00000000>;
+-};
+-
+-// Expose RP1 nodes as system nodes with labels
+-
+-&rp1_dma  {
+-	status = "okay";
+-};
+-
+-&rp1_eth {
+-	status = "okay";
+-	phy-handle = <&phy1>;
+-	phy-reset-gpios = <&rp1_gpio 32 GPIO_ACTIVE_LOW>;
+-	phy-reset-duration = <5>;
+-
+-	phy1: ethernet-phy@1 {
+-		reg = <0x1>;
+-		brcm,powerdown-enable;
+-		interrupt-parent = <&gpio>;
+-		interrupts = <37 IRQ_TYPE_LEVEL_LOW>;
+-	};
+-};
+-
+-gpio: &rp1_gpio {
+-	status = "okay";
+-};
+-
+-aux: &dummy {};
+-
+-&rp1_usb0 {
+-	pinctrl-0 = <&usb_vbus_pins>;
+-	pinctrl-names = "default";
+-	status = "okay";
+-};
+-
+-&rp1_usb1 {
+-	status = "okay";
+-};
+-
+-#include "bcm2712-rpi.dtsi"
+-
+-i2c_csi_dsi0: &i2c6 { // Note: This is for MIPI0 connector only
+-	pinctrl-0 = <&rp1_i2c6_38_39>;
+-	pinctrl-names = "default";
+-	clock-frequency = <100000>;
+-};
+-
+-i2c_csi_dsi1: &i2c0 { // Note: This is for MIPI1 connector
+-};
+-
+-i2c_csi_dsi: &i2c_csi_dsi1 { }; // An alias for compatibility
+-
+-cam1_reg: &cam0_reg { // Shares CAM_GPIO with cam0_reg
+-};
+-
+-csi0: &rp1_csi0 { };
+-csi1: &rp1_csi1 { };
+-dsi0: &rp1_dsi0 { };
+-dsi1: &rp1_dsi1 { };
+-dpi: &rp1_dpi { };
+-vec: &rp1_vec { };
+-dpi_gpio0:              &rp1_dpi_24bit_gpio0        { };
+-dpi_gpio1:              &rp1_dpi_24bit_gpio2        { };
+-dpi_18bit_cpadhi_gpio0: &rp1_dpi_18bit_cpadhi_gpio0 { };
+-dpi_18bit_cpadhi_gpio2: &rp1_dpi_18bit_cpadhi_gpio2 { };
+-dpi_18bit_gpio0:        &rp1_dpi_18bit_gpio0        { };
+-dpi_18bit_gpio2:        &rp1_dpi_18bit_gpio2        { };
+-dpi_16bit_cpadhi_gpio0: &rp1_dpi_16bit_cpadhi_gpio0 { };
+-dpi_16bit_cpadhi_gpio2: &rp1_dpi_16bit_cpadhi_gpio2 { };
+-dpi_16bit_gpio0:        &rp1_dpi_16bit_gpio0        { };
+-dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
+-
+-/* Add the IOMMUs for some RP1 bus masters */
+-
+-&csi0 {
+-	iommus = <&iommu5>;
+-};
+-
+-&csi1 {
+-	iommus = <&iommu5>;
+-};
+-
+-&dsi0 {
+-	iommus = <&iommu5>;
+-};
+-
+-&dsi1 {
+-	iommus = <&iommu5>;
+-};
+-
+-&dpi {
+-	iommus = <&iommu5>;
+-};
+-
+-&vec {
+-	iommus = <&iommu5>;
+-};
+-
+-&ddc0 {
+-	status = "disabled";
+-};
+-
+-&ddc1 {
+-	status = "disabled";
+-};
+-
+-&hdmi0 {
+-	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
+-	clock-names = "hdmi", "bvb", "audio", "cec";
+-	status = "disabled";
+-};
+-
+-&hdmi1 {
+-	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
+-	clock-names = "hdmi", "bvb", "audio", "cec";
+-	status = "disabled";
+-};
+-
+-&hvs {
+-	clocks = <&firmware_clocks 4>, <&firmware_clocks 16>;
+-	clock-names = "core", "disp";
+-};
+-
+-&mop {
+-	status = "disabled";
+-};
+-
+-&moplet {
+-	status = "disabled";
+-};
+-
+-&pixelvalve0 {
+-	status = "disabled";
+-};
+-
+-&pixelvalve1 {
+-	status = "disabled";
+-};
+-
+-&disp_intr {
+-	status = "disabled";
+-};
+-
+-/* SDIO1 is used to drive the eMMC/SD card */
+-&sdio1 {
+-	pinctrl-0 = <&emmc_cmddat_pulls>, <&emmc_ds_pull>;
+-	pinctrl-names = "default";
+-	vqmmc-supply = <&sd_io_1v8_reg>;
+-	vmmc-supply = <&sd_vcc_reg>;
+-	bus-width = <8>;
+-	sd-uhs-sdr50;
+-	sd-uhs-ddr50;
+-	sd-uhs-sdr104;
+-	mmc-hs200-1_8v;
+-	mmc-hs400-1_8v;
+-	mmc-hs400-enhanced-strobe;
+-	broken-cd;
+-	status = "okay";
+-};
+-
+-&pinctrl_aon {
+-	ant_pins: ant_pins {
+-		function = "gpio";
+-		pins = "aon_gpio5", "aon_gpio6";
+-	};
+-
+-	/* Slight hack - only one PWM pin (status LED) is usable */
+-	aon_pwm_1pin: aon_pwm_1pin {
+-		function = "aon_pwm";
+-		pins = "aon_gpio9";
+-	};
+-};
+-
+-&pinctrl {
+-	pwr_button_pins: pwr_button_pins {
+-		function = "gpio";
+-		pins = "gpio20";
+-		bias-pull-up;
+-	};
+-
+-	wl_on_pins: wl_on_pins {
+-		function = "gpio";
+-		pins = "gpio28";
+-	};
+-
+-	bt_shutdown_pins: bt_shutdown_pins {
+-		function = "gpio";
+-		pins = "gpio29";
+-	};
+-
+-	emmc_ds_pull: emmc_ds_pull {
+-		pins = "emmc_ds";
+-		bias-pull-down;
+-	};
+-
+-	emmc_cmddat_pulls: emmc_cmddat_pulls {
+-		pins = "emmc_cmd", "emmc_dat0", "emmc_dat1", "emmc_dat2", "emmc_dat3",
+-		       "emmc_dat4", "emmc_dat5", "emmc_dat6", "emmc_dat7";
+-		bias-pull-up;
+-	};
+-};
+-
+-/* uarta communicates with the BT module */
+-&uarta {
+-	uart-has-rtscts;
+-	auto-flow-control;
+-	status = "okay";
+-	clock-frequency = <96000000>;
+-	pinctrl-0 = <&uarta_24_pins &bt_shutdown_pins>;
+-	pinctrl-names = "default";
+-
+-	bluetooth: bluetooth {
+-		compatible = "brcm,bcm43438-bt";
+-		max-speed = <3000000>;
+-		shutdown-gpios = <&gio 29 GPIO_ACTIVE_HIGH>;
+-		local-bd-address = [ 00 00 00 00 00 00 ];
+-	};
+-};
+-
+-&i2c_rp1boot {
+-	clock-frequency = <400000>;
+-	pinctrl-0 = <&i2c3_m4_agpio0_pins>;
+-	pinctrl-names = "default";
+-};
+-
+-/ {
+-	chosen: chosen {
+-		bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
+-		stdout-path = "serial10:115200n8";
+-	};
+-
+-	fan: cooling_fan {
+-		status = "disabled";
+-		compatible = "pwm-fan";
+-		#cooling-cells = <2>;
+-		cooling-min-state = <0>;
+-		cooling-max-state = <3>;
+-		cooling-levels = <0 75 125 175 250>;
+-		pwms = <&rp1_pwm1 3 41566 PWM_POLARITY_INVERTED>;
+-		rpm-regmap = <&rp1_pwm1>;
+-		rpm-offset = <0x3c>;
+-	};
+-
+-	pwr_button {
+-		compatible = "gpio-keys";
+-
+-		pinctrl-names = "default";
+-		pinctrl-0 = <&pwr_button_pins>;
+-		status = "okay";
+-
+-		pwr_key: pwr {
+-			label = "pwr_button";
+-			// linux,code = <205>; // KEY_SUSPEND
+-			linux,code = <116>; // KEY_POWER
+-			gpios = <&gio 20 GPIO_ACTIVE_LOW>;
+-			debounce-interval = <50>; // ms
+-		};
+-	};
+-};
+-
+-&usb {
+-	power-domains = <&power RPI_POWER_DOMAIN_USB>;
+-};
+-
+-/* SDIO2 drives the WLAN interface */
+-&sdio2 {
+-	pinctrl-0 = <&sdio2_30_pins>, <&ant_pins>;
+-	pinctrl-names = "default";
+-	bus-width = <4>;
+-	vmmc-supply = <&wl_on_reg>;
+-	sd-uhs-ddr50;
+-	non-removable;
+-	status = "okay";
+-	#address-cells = <1>;
+-	#size-cells = <0>;
+-
+-	wifi: wifi@1 {
+-		reg = <1>;
+-		compatible = "brcm,bcm4329-fmac";
+-		local-mac-address = [00 00 00 00 00 00];
+-	};
+-};
+-
+-&rpivid {
+-	status = "okay";
+-};
+-
+-&pinctrl {
+-	spi10_gpio2: spi10_gpio2 {
+-		function = "vc_spi0";
+-		pins = "gpio2", "gpio3", "gpio4";
+-		bias-disable;
+-	};
+-
+-	spi10_cs_gpio1: spi10_cs_gpio1 {
+-		function = "gpio";
+-		pins = "gpio1";
+-		bias-pull-up;
+-	};
+-};
+-
+-spi10_pins: &spi10_gpio2 {};
+-spi10_cs_pins: &spi10_cs_gpio1 {};
+-
+-&spi10 {
+-	pinctrl-names = "default";
+-	cs-gpios = <&gio 1 1>;
+-	pinctrl-0 = <&spi10_pins &spi10_cs_pins>;
+-
+-	spidev10: spidev@0 {
+-		compatible = "spidev";
+-		reg = <0>;	/* CE0 */
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		spi-max-frequency = <20000000>;
+-		status = "okay";
+-	};
+-};
+-
+-// =============================================
+-// bcm2712-rpi-cm5.dtsi board specific stuff
+-
+-&gio_aon {
+-	// Don't use GIO_AON as an interrupt controller because it will
+-	// clash with the firmware monitoring the PMIC interrupt via the VPU.
+-
+-	/delete-property/ interrupt-controller;
+-};
+-
+-&main_aon_irq {
+-	// Don't use the MAIN_AON_IRQ interrupt controller because it will
+-	// clash with the firmware monitoring the PMIC interrupt via the VPU.
+-
+-	status = "disabled";
+-};
+-
+-&rp1_pwm1 {
+-	status = "disabled";
+-	pinctrl-0 = <&rp1_pwm1_gpio45>;
+-	pinctrl-names = "default";
+-};
+-
+-&thermal_trips {
+-	cpu_tepid: cpu-tepid {
+-		temperature = <50000>;
+-		hysteresis = <5000>;
+-		type = "active";
+-	};
+-
+-	cpu_warm: cpu-warm {
+-		temperature = <60000>;
+-		hysteresis = <5000>;
+-		type = "active";
+-	};
+-
+-	cpu_hot: cpu-hot {
+-		temperature = <67500>;
+-		hysteresis = <5000>;
+-		type = "active";
+-	};
+-
+-	cpu_vhot: cpu-vhot {
+-		temperature = <75000>;
+-		hysteresis = <5000>;
+-		type = "active";
+-	};
+-};
+-
+-&cooling_maps {
+-	tepid {
+-		trip = <&cpu_tepid>;
+-		cooling-device = <&fan 1 1>;
+-	};
+-
+-	warm {
+-		trip = <&cpu_warm>;
+-		cooling-device = <&fan 2 2>;
+-	};
+-
+-	hot {
+-		trip = <&cpu_hot>;
+-		cooling-device = <&fan 3 3>;
+-	};
+-
+-	vhot {
+-		trip = <&cpu_vhot>;
+-		cooling-device = <&fan 4 4>;
+-	};
+-
+-	melt {
+-		trip = <&cpu_crit>;
+-		cooling-device = <&fan 4 4>;
+-	};
+-};
+-
+-&gio {
+-	// The GPIOs above 35 are not used on Pi 5, so shrink the upper bank
+-	// to reduce the clutter in gpioinfo/pinctrl
+-	brcm,gpio-bank-widths = <32 4>;
+-
+-	gpio-line-names =
+-		"-", // GPIO_000
+-		"2712_BOOT_CS_N", // GPIO_001
+-		"2712_BOOT_MISO", // GPIO_002
+-		"2712_BOOT_MOSI", // GPIO_003
+-		"2712_BOOT_SCLK", // GPIO_004
+-		"-", // GPIO_005
+-		"-", // GPIO_006
+-		"-", // GPIO_007
+-		"-", // GPIO_008
+-		"-", // GPIO_009
+-		"-", // GPIO_010
+-		"-", // GPIO_011
+-		"-", // GPIO_012
+-		"-", // GPIO_013
+-		"-", // GPIO_014
+-		"-", // GPIO_015
+-		"-", // GPIO_016
+-		"-", // GPIO_017
+-		"-", // GPIO_018
+-		"-", // GPIO_019
+-		"PWR_GPIO", // GPIO_020
+-		"2712_G21_FS", // GPIO_021
+-		"-", // GPIO_022
+-		"-", // GPIO_023
+-		"BT_RTS", // GPIO_024
+-		"BT_CTS", // GPIO_025
+-		"BT_TXD", // GPIO_026
+-		"BT_RXD", // GPIO_027
+-		"WL_ON", // GPIO_028
+-		"BT_ON", // GPIO_029
+-		"WIFI_SDIO_CLK", // GPIO_030
+-		"WIFI_SDIO_CMD", // GPIO_031
+-		"WIFI_SDIO_D0", // GPIO_032
+-		"WIFI_SDIO_D1", // GPIO_033
+-		"WIFI_SDIO_D2", // GPIO_034
+-		"WIFI_SDIO_D3"; // GPIO_035
+-};
+-
+-&gio_aon {
+-	gpio-line-names =
+-		"RP1_SDA", // AON_GPIO_00
+-		"RP1_SCL", // AON_GPIO_01
+-		"RP1_RUN", // AON_GPIO_02
+-		"SD_IOVDD_SEL", // AON_GPIO_03
+-		"SD_PWR_ON", // AON_GPIO_04
+-		"ANT1", // AON_GPIO_05
+-		"ANT2", // AON_GPIO_06
+-		"-", // AON_GPIO_07
+-		"2712_WAKE", // AON_GPIO_08
+-		"2712_STAT_LED", // AON_GPIO_09
+-		"-", // AON_GPIO_10
+-		"-", // AON_GPIO_11
+-		"PMIC_INT", // AON_GPIO_12
+-		"UART_TX_FS", // AON_GPIO_13
+-		"UART_RX_FS", // AON_GPIO_14
+-		"-", // AON_GPIO_15
+-		"-", // AON_GPIO_16
+-
+-		// Pad bank0 out to 32 entries
+-		"", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
+-
+-		"HDMI0_SCL", // AON_SGPIO_00
+-		"HDMI0_SDA", // AON_SGPIO_01
+-		"HDMI1_SCL", // AON_SGPIO_02
+-		"HDMI1_SDA", // AON_SGPIO_03
+-		"PMIC_SCL", // AON_SGPIO_04
+-		"PMIC_SDA"; // AON_SGPIO_05
+-
+-	rp1_run_hog {
+-		gpio-hog;
+-		gpios = <2 GPIO_ACTIVE_HIGH>;
+-		output-high;
+-		line-name = "RP1 RUN pin";
+-	};
+-
+-	ant1: ant1-hog {
+-		gpio-hog;
+-		gpios = <5 GPIO_ACTIVE_HIGH>;
+-		/* internal antenna enabled */
+-		output-high;
+-		line-name = "ant1";
+-	};
+-
+-	ant2: ant2-hog {
+-		gpio-hog;
+-		gpios = <6 GPIO_ACTIVE_HIGH>;
+-		/* external antenna disabled */
+-		output-low;
+-		line-name = "ant2";
+-	};
+-};
+-
+-&rp1_gpio {
+-	gpio-line-names =
+-		"ID_SDA", // GPIO0
+-		"ID_SCL", // GPIO1
+-		"GPIO2", // GPIO2
+-		"GPIO3", // GPIO3
+-		"GPIO4", // GPIO4
+-		"GPIO5", // GPIO5
+-		"GPIO6", // GPIO6
+-		"GPIO7", // GPIO7
+-		"GPIO8", // GPIO8
+-		"GPIO9", // GPIO9
+-		"GPIO10", // GPIO10
+-		"GPIO11", // GPIO11
+-		"GPIO12", // GPIO12
+-		"GPIO13", // GPIO13
+-		"GPIO14", // GPIO14
+-		"GPIO15", // GPIO15
+-		"GPIO16", // GPIO16
+-		"GPIO17", // GPIO17
+-		"GPIO18", // GPIO18
+-		"GPIO19", // GPIO19
+-		"GPIO20", // GPIO20
+-		"GPIO21", // GPIO21
+-		"GPIO22", // GPIO22
+-		"GPIO23", // GPIO23
+-		"GPIO24", // GPIO24
+-		"GPIO25", // GPIO25
+-		"GPIO26", // GPIO26
+-		"GPIO27", // GPIO27
+-
+-		"PCIE_PWR_EN", // GPIO28
+-		"FAN_TACH", // GPIO29
+-		"HOST_SDA", // GPIO30
+-		"HOST_SCL", // GPIO31
+-		"ETH_RST_N", // GPIO32
+-		"PCIE_DET_WAKE", // GPIO33
+-
+-		"CD0_IO0_MICCLK", // GPIO34
+-		"CD0_IO0_MICDAT0", // GPIO35
+-		"RP1_PCIE_CLKREQ_N", // GPIO36
+-		"ETH_IRQ_N", // GPIO37
+-		"SDA0", // GPIO38
+-		"SCL0", // GPIO39
+-		"-", // GPIO40
+-		"-", // GPIO41
+-		"USB_VBUS_EN", // GPIO42
+-		"USB_OC_N", // GPIO43
+-		"RP1_STAT_LED", // GPIO44
+-		"FAN_PWM", // GPIO45
+-		"-", // GPIO46
+-		"2712_WAKE", // GPIO47
+-		"-", // GPIO48
+-		"-", // GPIO49
+-		"-", // GPIO50
+-		"-", // GPIO51
+-		"-", // GPIO52
+-		"-"; // GPIO53
+-
+-	usb_vbus_pins: usb_vbus_pins {
+-		function = "vbus1";
+-		pins = "gpio42", "gpio43";
+-	};
+-};
+#include "bcm2712-rpi-cm5.dtsi"
+ 
+ // =============================================
+ // BCM2712D0 overrides
+@@ -858,6 +111,8 @@ &rp1_usb1 {
+ &sdio1 {
+ 	no-sdio;
+ 	no-sd;
+
+	/delete-property/ supports-cqe;
+ };
+ 
+ &leds {
+@@ -979,95 +234,19 @@ dailink0_slave: simple-audio-card,codec {
+ 
+ / {
+ 	aliases: aliases {
+-		blconfig = &blconfig;
+-		blpubkey = &blpubkey;
+-		bluetooth = &bluetooth;
+-		console = &uart10;
+-		ethernet0 = &rp1_eth;
+-		wifi0 = &wifi;
+-		fb = &fb;
+-		mailbox = &mailbox;
+-		mmc0 = &sdio1;
+-		uart10 = &uart10;
+ 		serial0 = &uart0;
+ 		serial1 = &uart3;
+ 		serial2 = &uart4;
+ 		serial10 = &uart10;
+-		i2c = &i2c_arm;
+-		i2c0 = &i2c0;
+-		i2c1 = &i2c1;
+-		i2c2 = &i2c2;
+-		i2c3 = &i2c3;
+-		i2c4 = &i2c4;
+-		i2c5 = &i2c5;
+-		i2c6 = &i2c6;
+-		i2c10 = &i2c_rp1boot;
+-		// Bit-bashed i2c_gpios start at 10
+-		spi0 = &spi0;
+-		spi1 = &spi1;
+-		spi2 = &spi2;
+-		spi3 = &spi3;
+-		spi4 = &spi4;
+-		spi5 = &spi5;
+-		spi10 = &spi10;
+-		gpio0 = &gpio;
+-		gpio1 = &gio;
+-		gpio2 = &gio_aon;
+-		gpio3 = &pinctrl;
+-		gpio4 = &pinctrl_aon;
+-		usb0 = &rp1_usb0;
+-		usb1 = &rp1_usb1;
+-		drm-dsi1 = &dsi0;
+-		drm-dsi2 = &dsi1;
+		/delete-property/ i2c10;
+		/delete-property/ i2c11;
+ 	};
+ 
+ 	__overrides__ {
+-		bdaddr = <&bluetooth>, "local-bd-address[";
+-		button_debounce = <&pwr_key>, "debounce-interval:0";
+-		uart0_console = <&uart0>,"status", <&aliases>, "console=",&uart0;
+-		i2c1 = <&i2c1>, "status";
+-		i2c = <&i2c1>, "status";
+-		i2c_arm = <&i2c_arm>, "status";
+-		i2c_vc = <&i2c_vc>, "status";
+-		i2c_csi_dsi = <&i2c_csi_dsi>, "status";
+-		i2c_csi_dsi0 = <&i2c_csi_dsi0>, "status";
+-		i2c_csi_dsi1 = <&i2c_csi_dsi1>, "status";
+-		i2c1_baudrate = <&i2c1>, "clock-frequency:0";
+-		i2c_baudrate = <&i2c_arm>, "clock-frequency:0";
+-		i2c_arm_baudrate = <&i2c_arm>, "clock-frequency:0";
+-		i2c_vc_baudrate = <&i2c_vc>, "clock-frequency:0";
+-		krnbt = <&bluetooth>, "status";
+-		nvme = <&pciex1>, "status";
+-		pciex1 = <&pciex1>, "status";
+-		pciex1_gen = <&pciex1> , "max-link-speed:0";
+-		pciex1_no_l0s = <&pciex1>, "aspm-no-l0s?";
+-		pciex1_tperst_clk_ms = <&pciex1>, "brcm,tperst-clk-ms:0";
+-		pcie_tperst_clk_ms = <&pciex1>, "brcm,tperst-clk-ms:0";
+-		random = <&random>, "status";
+-		spi = <&spi0>, "status";
+-		suspend = <&pwr_key>, "linux,code:0=205";
+-		uart0 = <&uart0>, "status";
+-		wifiaddr = <&wifi>, "local-mac-address[";
+-
+-		act_led_activelow = <&led_act>, "active-low?";
+-		act_led_trigger = <&led_act>, "linux,default-trigger";
+-		pwr_led_activelow = <&led_pwr>, "gpios:8";
+-		pwr_led_trigger = <&led_pwr>, "linux,default-trigger";
+		/delete-property/ i2c_csi_dsi;
+		/delete-property/ i2c_csi_dsi0;
+		/delete-property/ i2c_csi_dsi1;
+		/delete-property/ sd_cqe;
+ 		usr_led_trigger = <&led_usr>, "linux,default-trigger";
+-		eth_led0 = <&phy1>,"led-modes:0";
+-		eth_led1 = <&phy1>,"led-modes:4";
+-
+-		ant1 =  <&ant1>,"output-high?=on",
+-			<&ant1>, "output-low?=off",
+-			<&ant2>, "output-high?=off",
+-			<&ant2>, "output-low?=on";
+-		ant2 =  <&ant1>,"output-high?=off",
+-			<&ant1>, "output-low?=on",
+-			<&ant2>, "output-high?=on",
+-			<&ant2>, "output-low?=off";
+-		noant = <&ant1>,"output-high?=off",
+-			<&ant1>, "output-low?=on",
+-			<&ant2>, "output-high?=off",
+-			<&ant2>, "output-low?=on";
+ 	};
+ };
--- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0022-ARM-dts-bcm2711-yellow-Fix-includes-for-rpi-6.12.y.patch
+++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0022-ARM-dts-bcm2711-yellow-Fix-includes-for-rpi-6.12.y.patch
@ -0,0 +1,37 @@
+From 1812508c56075e1ea38e57987fe5b596f1791ebc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Tue, 22 Apr 2025 16:53:59 +0200
+Subject: [PATCH] ARM: dts: bcm2711: yellow: Fix includes for rpi-6.12.y
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix duplicate i2c0mux label that's now present both in bcm2711-rpi.dtsi and
+bcm270x.dtsi. Use the same include order as in bcm2711-rpi-cm4.dts.
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
+index b3d57a53d2224..1aaadaa8e1bfc 100644
+--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
+@@ -3,13 +3,14 @@
+ #define BCM2711
+ #define i2c0 i2c0if
+ #include "bcm2711.dtsi"
+#include "bcm2711-rpi.dtsi"
+/delete-node/&i2c0mux;
+#include "bcm283x-rpi-led-deprecated.dtsi"
+ #include "bcm283x-rpi-wifi-bt.dtsi"
+ #undef i2c0
+ #include "bcm270x.dtsi"
+ #define i2c0 i2c0mux
+-#include "bcm2711-rpi.dtsi"
+ #undef i2c0
+-//#include "bcm283x-rpi-usb-peripheral.dtsi"
+ 
+ #include <dt-bindings/input/input.h>
+ 
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@ -1,7 +1,7 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
@ -19,9 +19,9 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2 $(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_20250127.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
+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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b"
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@ -1,6 +1,6 @@
 BR2_aarch64=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
@ -18,9 +18,9 @@ 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_20250127.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+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
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3 broadcom/bcm2710-rpi-zero-2 broadcom/bcm2710-rpi-zero-2-w"
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@ -1,7 +1,7 @@
 BR2_arm=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
@ -19,9 +19,9 @@ 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 $(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_20250127.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
+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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3 broadcom/bcm2710-rpi-zero-2 broadcom/bcm2710-rpi-zero-2-w"
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@ -1,6 +1,6 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
@ -18,9 +18,9 @@ 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_20250127.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+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
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4"
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@ -1,7 +1,7 @@
 BR2_arm=y
 BR2_cortex_a72=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
@ -19,9 +19,9 @@ 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 $(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_20250127.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
+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_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4"
--- a/buildroot-external/configs/rpi5_64_defconfig
+++ b/buildroot-external/configs/rpi5_64_defconfig
@ -1,6 +1,6 @@
 BR2_aarch64=y
 BR2_cortex_a76=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
@ -18,9 +18,9 @@ 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_20250127.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2712"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+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
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b broadcom/bcm2712-rpi-500 broadcom/bcm2712-rpi-cm5-cm4io broadcom/bcm2712-rpi-cm5-cm5io broadcom/bcm2712-rpi-cm5l-cm4io broadcom/bcm2712-rpi-cm5l-cm5io"
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@ -1,6 +1,6 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
@ -18,9 +18,9 @@ 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_20250127.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/cd231d4775b14f228606c09f219b48308f6ab3aa.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+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
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4-ha-yellow broadcom/bcm2712-rpi-cm5-ha-yellow"
--- a/buildroot-external/kernel/v6.6.y/device-support-pci.config
+++ b/buildroot-external/kernel/v6.6.y/device-support-pci.config
@ -1,46 +0,0 @@
-CONFIG_IGB=y
-CONFIG_IGC=m
-
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_AQTION=m
-
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ALX=m
-
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_BNXT=m
-
-CONFIG_BROADCOM_PHY=m
-
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-
-# Mellanox ConnectX-3 NIC support
-CONFIG_MLX4_EN=m
-# CONFIG_MLX4_DEBUG is not set
-CONFIG_MLX4_CORE_GEN2=y
-
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-# PCI sound drivers
-CONFIG_SND_PCI=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-
-# NVMe SSD support
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
--- a/buildroot-external/kernel/v6.6.y/device-support-wireless.config
+++ b/buildroot-external/kernel/v6.6.y/device-support-wireless.config
@ -1,81 +0,0 @@
-# This fragment contains configuration options for all platforms that
-# should support WiFi connectivity over USB or SDIO. It does not contain
-# drivers for PCI or PCIe devices - those need also inclusion of
-# device-support-wireless-pci.config fragment.
-
-# Atheros drivers
-CONFIG_WLAN_VENDOR_ATH=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_SDIO=m
-CONFIG_ATH10K_USB=m
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_HTC=m
-CONFIG_CARL9170=m
-
-# Broadcom drivers
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_USB=y
-
-# Intel drivers
-# Note: enabling it here but Intel drivers are currently exclusively PCI
-CONFIG_WLAN_VENDOR_INTEL=y
-
-# Marvell drivers
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-
-# Mediatek drivers
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT7663U=m
-CONFIG_MT7663S=m
-CONFIG_MT76x0E=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x2U=m
-CONFIG_MT76x2E=m
-CONFIG_MT7921S=m
-CONFIG_MT7921U=m
-
-# Ralink drivers
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2X00=m
-
-# Realtek drivers
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTW88=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
-CONFIG_RTW88_8723DS=m
-CONFIG_RTW88_8723DU=m
-CONFIG_RTW88_8821CS=m
-# Use OOT driver for 8821CU instead, see: https://github.com/home-assistant/operating-system/issues/3205
-# CONFIG_RTW88_8821CU is not set
-CONFIG_RTW89=m
-
-# Staging drivers
-CONFIG_STAGING=y
-CONFIG_RTL8723BS=m
--- a/buildroot-external/kernel/v6.6.y/device-support.config
+++ b/buildroot-external/kernel/v6.6.y/device-support.config
@ -1,182 +0,0 @@
-CONFIG_USB_GADGET=y
-
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VUDC=m
-
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-
-CONFIG_USB_ACM=m
-
-# USB Network AdapterS
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-
-CONFIG_MEDIA_CEC_SUPPORT=y
-
-# Required for BT drivers
-CONFIG_SERIAL_DEV_BUS=y
-
-# Bluetooth device drivers
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_MTK=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_RTL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-
-# Multimedia core support
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_SUPPORT_FILTER=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_CONTROLLER_DVB=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-
-# Webcam devices
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_S2255=m
-
-# Analog capture USB devices
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_STK1160=m
-
-# Analog/digital capture USB devices
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_CX2341X=m
-
-# Webcam/capture (analog/digital) USB devices
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-
-# Audio devices (USB/PCI)
-CONFIG_SND_USB_AUDIO=m
-
-# GPIO support
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-
-# Can Bus support
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_PEAK_USB=m
-
-# 1-wire
-CONFIG_W1=y
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_GPIO=m
--- a/buildroot-external/kernel/v6.6.y/docker.config
+++ b/buildroot-external/kernel/v6.6.y/docker.config
@ -1,74 +0,0 @@
-CONFIG_POSIX_MQUEUE=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_NET_SCHED=y
-# CONFIG_RT_GROUP_SCHED is not set
-
-CONFIG_CGROUPS=y
-CONFIG_CPUSETS=y
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_NET_CLS_CGROUP=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_BPF=y
-CONFIG_BPF_SYSCALL=y
-
-CONFIG_MEMCG=y
-
-CONFIG_NAMESPACES=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_IPC_NS=y
-CONFIG_UTS_NS=y
-
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_MACVLAN=m
-CONFIG_IPVLAN=m
-CONFIG_VXLAN=m
-
-CONFIG_INET=y
-CONFIG_IPV6=y
-CONFIG_INET_ESP=m
-CONFIG_NETCONSOLE=y
-CONFIG_VETH=y
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_NAT=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_NAT=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_IPVS=y
-CONFIG_IP_VS=y
-CONFIG_IP_VS_RR=y
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_BRIDGE=y
-CONFIG_BRIDGE_NETFILTER=y
-CONFIG_XFRM_USER=m
-CONFIG_NET_L3_MASTER_DEV=y
-
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_OVERLAY_FS=y
-# CONFIG_OVERLAY_FS_METACOPY is not set
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CMAC=y
--- a/buildroot-external/kernel/v6.6.y/hassos.config
+++ b/buildroot-external/kernel/v6.6.y/hassos.config
@ -1,210 +0,0 @@
-CONFIG_LOCALVERSION="-haos"
-CONFIG_EXPERT=y
-
-# GCC plugins are disabled by linux.mk, disable them here to reduce
-# linux-diff-config noise
-CONFIG_GCC_PLUGINS=n
-
-CONFIG_CMDLINE=""
-CONFIG_PANIC_TIMEOUT=5
-
-CONFIG_PREEMPT=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_DEBUG_PREEMPT is not set
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_XZ is not set
-
-CONFIG_FW_LOADER_COMPRESS=y
-CONFIG_FW_LOADER_COMPRESS_ZSTD=y
-
-CONFIG_ZRAM=y
-CONFIG_ZSWAP=y
-CONFIG_ZSWAP_DEFAULT_ON=y
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
-CONFIG_ZSMALLOC=y
-
-CONFIG_LRU_GEN=y
-CONFIG_LRU_GEN_ENABLED=y
-
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_BLOCK=y
-CONFIG_EROFS_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_BTRFS_FS=m
-CONFIG_NTFS3_FS=m
-CONFIG_EXFAT_FS=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_DM_VERITY=y
-
-CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
-
-CONFIG_AUDIT=y
-CONFIG_DEFAULT_SECURITY_APPARMOR=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_APPARMOR=y
-# CONFIG_SECURITY_SELINUX is not set
-CONFIG_LSM="apparmor"
-
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-
-# CONFIG_LOGO is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_LE=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_LEDS=y
-
-CONFIG_IPV6=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_REACHABILITY_PROBE=y
-CONFIG_IPV6_SIT=m
-
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_MROUTE=y
-
-CONFIG_MPTCP=y
-CONFIG_MPTCP_IPV6=y
-
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_FLOW_TABLE=m
-
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-CONFIG_NFT_XFRM=m
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-CONFIG_NFT_SYNPROXY=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NFT_REJECT_NETDEV=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_XT_SET=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-
-CONFIG_TUN=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FQ_CODEL=m
-
-CONFIG_WIRELESS=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT=y
-
-CONFIG_CIFS=m
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DFS_UPCALL=y
-
-CONFIG_WIREGUARD=m
-
-CONFIG_HID=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=y
-
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y