From 2254260dad8aba580632334c5ac4850d79ab9048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 10 Apr 2024 10:04:35 +0200 Subject: [PATCH] Update Raspberry Pi Kernel to v6.6.20 (#3297) * RaspberryPi: Update kernel to 6.6.20 - 6f16847710cc0502450788b9f12f0a14d3429668 Used version specified in RPi OS release notes [1]. [1] https://downloads.raspberrypi.org/raspios_arm64/release_notes.txt * Update RPi Buildroot defconfigs for v6.6.y kernel * Update RPi kernel patches for v6.6.y kernel * Amended old patches to accomodate for new DTS paths * Removed 6.6.25 patches -> moved to the common folder * Added patch to fix Yellow DTS compilation * Bump buildroot to update rpi-firmware * buildroot b45d671fe3...9f5750121a (1): > package/rpi-firmware: bump to version for (untagged) kernel v6.6.20 * Remove kernel v6.1.y config fragments, as they're not needed anymore --- Documentation/kernel.md | 14 +- buildroot | 2 +- ...x-add-compatible-picked-up-by-U-Boot.patch | 28 +- ...changes-causing-issues-with-Z-Wave.m.patch | 677 ------------------ ...Add-device-tree-for-Home-Assistant-Y.patch | 41 +- ...yellow-Mux-UART4-for-SiLabs-radio-mo.patch | 18 +- ...M-dts-bcm2711-yellow-Mux-debug-UART5.patch | 18 +- ...cm2711-yellow-Enable-I2C6-by-default.patch | 18 +- ...s-bcm2711-yellow-add-I2S-audio-codec.patch | 18 +- ...-dts-bcm2711-yellow-enable-GPIO-keys.patch | 18 +- ...-ARM-dts-bcm2711-yellow-add-user-LED.patch | 18 +- ...bcm2711-yellow-add-NXP-PCF85063A-RTC.patch | 18 +- ...yellow-enable-USB-host-mode-by-defau.patch | 18 +- ...yellow-use-generic-activity-trigger-.patch | 18 +- ...1-yellow-use-USB-OTG-mode-by-default.patch | 18 +- ...dts-bcm2711-yellow-Add-LED-overrides.patch | 18 +- ...yellow-use-serial-alias-to-enumerate.patch | 18 +- ...yellow-Use-mini-UART-for-Bluetooth-b.patch | 15 +- ...yellow-Fix-leds-node-referencing-aft.patch | 41 ++ buildroot-external/configs/rpi2_defconfig | 8 +- buildroot-external/configs/rpi3_64_defconfig | 6 +- buildroot-external/configs/rpi3_defconfig | 8 +- buildroot-external/configs/rpi4_64_defconfig | 6 +- buildroot-external/configs/rpi4_defconfig | 8 +- buildroot-external/configs/rpi5_64_defconfig | 6 +- buildroot-external/configs/yellow_defconfig | 6 +- .../kernel/v6.1.y/device-support-pci.config | 38 - .../v6.1.y/device-support-wireless-pci.config | 50 -- .../v6.1.y/device-support-wireless.config | 73 -- .../kernel/v6.1.y/device-support.config | 182 ----- .../kernel/v6.1.y/docker.config | 74 -- .../kernel/v6.1.y/hassos.config | 201 ------ ...changes-causing-issues-with-Z-Wave.m.patch | 0 ...to-explicitly-enable-reachability-te.patch | 52 -- 34 files changed, 175 insertions(+), 1577 deletions(-) delete mode 100644 buildroot-external/board/raspberrypi/patches/linux/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch create mode 100644 buildroot-external/board/raspberrypi/yellow/patches/linux/0015-ARM-dts-bcm2711-yellow-Fix-leds-node-referencing-aft.patch delete mode 100644 buildroot-external/kernel/v6.1.y/device-support-pci.config delete mode 100644 buildroot-external/kernel/v6.1.y/device-support-wireless-pci.config delete mode 100644 buildroot-external/kernel/v6.1.y/device-support-wireless.config delete mode 100644 buildroot-external/kernel/v6.1.y/device-support.config delete mode 100644 buildroot-external/kernel/v6.1.y/docker.config delete mode 100644 buildroot-external/kernel/v6.1.y/hassos.config rename buildroot-external/patches/linux/{6.6.25 => }/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch (100%) delete mode 100644 buildroot-external/patches/linux/6.6.25/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch diff --git a/Documentation/kernel.md b/Documentation/kernel.md index 7790f2b10..e72d46e9d 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -6,13 +6,13 @@ Default Kernel tree: 6.1 | Board | Version | |-------|---------| | Open Virtual Appliance | 6.6.25 | -| Raspberry Pi | 6.1.73 | -| Raspberry Pi 0-W | 6.1.73 | -| Raspberry Pi 2 | 6.1.73 | -| Raspberry Pi 3 | 6.1.73 | -| Raspberry Pi 4 | 6.1.73 | -| Raspberry Pi 5 | 6.1.73 | -| Home Assistant Yellow | 6.1.73 | +| Raspberry Pi | 6.6.20 | +| Raspberry Pi 0-W | 6.6.20 | +| Raspberry Pi 2 | 6.6.20 | +| Raspberry Pi 3 | 6.6.20 | +| Raspberry Pi 4 | 6.6.20 | +| Raspberry Pi 5 | 6.6.20 | +| Home Assistant Yellow | 6.6.20 | | Home Assistant Green | 6.6.25 | | Tinker Board | 6.6.25 | | ODROID-C2 | 6.6.25 | diff --git a/buildroot b/buildroot index b45d671fe..9f5750121 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit b45d671fe3cfa11d47fc2651ea255cfae3c1c045 +Subproject commit 9f5750121a2f0847d5afa0fad7b6efa62c02979a 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 bffec3db6..5afa31419 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,5 +1,4 @@ -From 57188c09ac02bfa61cce55932ccba43ec7210e54 Mon Sep 17 00:00:00 2001 -Message-Id: <57188c09ac02bfa61cce55932ccba43ec7210e54.1677499675.git.stefan@agner.ch> +From e2f2644f306f44e65bb8082bac3c26cb5e699664 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 @@ -12,14 +11,14 @@ not using that compatible string. Signed-off-by: Pascal Vizeli Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711.dtsi | 8 ++++---- - arch/arm/boot/dts/bcm283x.dtsi | 2 +- + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 8 ++++---- + arch/arm/boot/dts/broadcom/bcm283x.dtsi | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 941c4d16791b..3cd49fa4bafd 100644 ---- a/arch/arm/boot/dts/bcm2711.dtsi -+++ b/arch/arm/boot/dts/bcm2711.dtsi +diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi +index 4a379a14966d8..30f6ccdcef178 100644 +--- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi ++++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi @@ -128,7 +128,7 @@ rng@7e104000 { }; @@ -56,11 +55,11 @@ index 941c4d16791b..3cd49fa4bafd 100644 reg = <0x7e201a00 0x200>; interrupts = ; clocks = <&clocks BCM2835_CLOCK_UART>, -diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index d2d9c6e67f39..7b9a2e8cf529 100644 ---- a/arch/arm/boot/dts/bcm283x.dtsi -+++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -302,7 +302,7 @@ uart1_ctsrts_gpio42: uart1_ctsrts_gpio42 { +diff --git a/arch/arm/boot/dts/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi +index 2ca8a2505a4db..6f91c85677d89 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 { }; uart0: serial@7e201000 { @@ -69,6 +68,3 @@ index d2d9c6e67f39..7b9a2e8cf529 100644 reg = <0x7e201000 0x200>; interrupts = <2 25>; clocks = <&clocks BCM2835_CLOCK_UART>, --- -2.39.1 - diff --git a/buildroot-external/board/raspberrypi/patches/linux/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch b/buildroot-external/board/raspberrypi/patches/linux/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch deleted file mode 100644 index 72b6cc605..000000000 --- a/buildroot-external/board/raspberrypi/patches/linux/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch +++ /dev/null @@ -1,677 +0,0 @@ -From 74c48f9493b3e95ec1f76b92b88061194c1874fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= -Date: Mon, 4 Mar 2024 13:52:34 +0100 -Subject: [PATCH] Revert USB core changes causing issues with Z-Wave.me UZB - stick -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Workaround for issues described on GH [1] and reported in [2]. - -* Revert "USB: core: Fix oversight in SuperSpeed initialization" - This reverts commit f705617bab4766567874715eeed1b39dacb58671. - -* Revert "USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()" - This reverts commit 8186596a663506b1124bede9fde6f243ef9f37ee. - -* Revert "USB: core: Change usb_get_device_descriptor() API" - This reverts commit d309fa69c2e3c5e6134ac9386f833f683e66ad1a. - -* Revert "USB: core: Unite old scheme and new scheme descriptor reads" - This reverts commit 90b01f8df56844cb4ac8f188eed92a5ee866020a. - -[1] https://github.com/home-assistant/operating-system/issues/2995 -[2] https://lore.kernel.org/linux-usb/1e954652-dfb3-4248-beea-b8a449128ff0@sairon.cz/ - -Signed-off-by: Jan Čermák ---- - drivers/usb/core/hcd.c | 10 +- - drivers/usb/core/hub.c | 349 ++++++++++++++++--------------------- - drivers/usb/core/message.c | 29 +-- - drivers/usb/core/usb.h | 4 +- - 4 files changed, 169 insertions(+), 223 deletions(-) - -diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index be96045e4d6e3..4e240151c06af 100644 ---- a/drivers/usb/core/hcd.c -+++ b/drivers/usb/core/hcd.c -@@ -983,7 +983,6 @@ static int register_root_hub(struct usb_hcd *hcd) - { - struct device *parent_dev = hcd->self.controller; - struct usb_device *usb_dev = hcd->self.root_hub; -- struct usb_device_descriptor *descr; - const int devnum = 1; - int retval; - -@@ -995,16 +994,13 @@ static int register_root_hub(struct usb_hcd *hcd) - mutex_lock(&usb_bus_idr_lock); - - usb_dev->ep0.desc.wMaxPacketSize = cpu_to_le16(64); -- descr = usb_get_device_descriptor(usb_dev); -- if (IS_ERR(descr)) { -- retval = PTR_ERR(descr); -+ retval = usb_get_device_descriptor(usb_dev, USB_DT_DEVICE_SIZE); -+ if (retval != sizeof usb_dev->descriptor) { - mutex_unlock(&usb_bus_idr_lock); - dev_dbg (parent_dev, "can't read %s device descriptor %d\n", - dev_name(&usb_dev->dev), retval); -- return retval; -+ return (retval < 0) ? retval : -EMSGSIZE; - } -- usb_dev->descriptor = *descr; -- kfree(descr); - - if (le16_to_cpu(usb_dev->descriptor.bcdUSB) >= 0x0201) { - retval = usb_get_bos_descriptor(usb_dev); -diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 574b8104a8199..708b63bcd38af 100644 ---- a/drivers/usb/core/hub.c -+++ b/drivers/usb/core/hub.c -@@ -2664,17 +2664,12 @@ int usb_authorize_device(struct usb_device *usb_dev) - } - - if (usb_dev->wusb) { -- struct usb_device_descriptor *descr; -- -- descr = usb_get_device_descriptor(usb_dev); -- if (IS_ERR(descr)) { -- result = PTR_ERR(descr); -+ result = usb_get_device_descriptor(usb_dev, sizeof(usb_dev->descriptor)); -+ if (result < 0) { - dev_err(&usb_dev->dev, "can't re-read device descriptor for " - "authorization: %d\n", result); - goto error_device_descriptor; - } -- usb_dev->descriptor = *descr; -- kfree(descr); - } - - usb_dev->authorized = 1; -@@ -4685,67 +4680,6 @@ static int hub_enable_device(struct usb_device *udev) - return hcd->driver->enable_device(hcd, udev); - } - --/* -- * Get the bMaxPacketSize0 value during initialization by reading the -- * device's device descriptor. Since we don't already know this value, -- * the transfer is unsafe and it ignores I/O errors, only testing for -- * reasonable received values. -- * -- * For "old scheme" initialization, size will be 8 so we read just the -- * start of the device descriptor, which should work okay regardless of -- * the actual bMaxPacketSize0 value. For "new scheme" initialization, -- * size will be 64 (and buf will point to a sufficiently large buffer), -- * which might not be kosher according to the USB spec but it's what -- * Windows does and what many devices expect. -- * -- * Returns: bMaxPacketSize0 or a negative error code. -- */ --static int get_bMaxPacketSize0(struct usb_device *udev, -- struct usb_device_descriptor *buf, int size, bool first_time) --{ -- int i, rc; -- -- /* -- * Retry on all errors; some devices are flakey. -- * 255 is for WUSB devices, we actually need to use -- * 512 (WUSB1.0[4.8.1]). -- */ -- for (i = 0; i < GET_MAXPACKET0_TRIES; ++i) { -- /* Start with invalid values in case the transfer fails */ -- buf->bDescriptorType = buf->bMaxPacketSize0 = 0; -- rc = usb_control_msg(udev, usb_rcvaddr0pipe(), -- USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, -- USB_DT_DEVICE << 8, 0, -- buf, size, -- initial_descriptor_timeout); -- switch (buf->bMaxPacketSize0) { -- case 8: case 16: case 32: case 64: case 9: -- if (buf->bDescriptorType == USB_DT_DEVICE) { -- rc = buf->bMaxPacketSize0; -- break; -- } -- fallthrough; -- default: -- if (rc >= 0) -- rc = -EPROTO; -- break; -- } -- -- /* -- * Some devices time out if they are powered on -- * when already connected. They need a second -- * reset, so return early. But only on the first -- * attempt, lest we get into a time-out/reset loop. -- */ -- if (rc > 0 || (rc == -ETIMEDOUT && first_time && -- udev->speed > USB_SPEED_FULL)) -- break; -- } -- return rc; --} -- --#define GET_DESCRIPTOR_BUFSIZE 64 -- - /* Reset device, (re)assign address, get device descriptor. - * Device connection must be stable, no more debouncing needed. - * Returns device in USB_STATE_ADDRESS, except on error. -@@ -4755,17 +4689,10 @@ static int get_bMaxPacketSize0(struct usb_device *udev, - * the port lock. For a newly detected device that is not accessible - * through any global pointers, it's not necessary to lock the device, - * but it is still necessary to lock the port. -- * -- * For a newly detected device, @dev_descr must be NULL. The device -- * descriptor retrieved from the device will then be stored in -- * @udev->descriptor. For an already existing device, @dev_descr -- * must be non-NULL. The device descriptor will be stored there, -- * not in @udev->descriptor, because descriptors for registered -- * devices are meant to be immutable. - */ - static int - hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, -- int retry_counter, struct usb_device_descriptor *dev_descr) -+ int retry_counter) - { - struct usb_device *hdev = hub->hdev; - struct usb_hcd *hcd = bus_to_hcd(hdev->bus); -@@ -4777,13 +4704,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - int devnum = udev->devnum; - const char *driver_name; - bool do_new_scheme; -- const bool initial = !dev_descr; -- int maxp0; -- struct usb_device_descriptor *buf, *descr; -- -- buf = kmalloc(GET_DESCRIPTOR_BUFSIZE, GFP_NOIO); -- if (!buf) -- return -ENOMEM; - - /* root hub ports have a slightly longer reset period - * (from USB 2.0 spec, section 7.1.7.5) -@@ -4816,34 +4736,32 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - } - oldspeed = udev->speed; - -- if (initial) { -- /* USB 2.0 section 5.5.3 talks about ep0 maxpacket ... -- * it's fixed size except for full speed devices. -- * For Wireless USB devices, ep0 max packet is always 512 (tho -- * reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. -+ /* USB 2.0 section 5.5.3 talks about ep0 maxpacket ... -+ * it's fixed size except for full speed devices. -+ * For Wireless USB devices, ep0 max packet is always 512 (tho -+ * reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. -+ */ -+ switch (udev->speed) { -+ case USB_SPEED_SUPER_PLUS: -+ case USB_SPEED_SUPER: -+ case USB_SPEED_WIRELESS: /* fixed at 512 */ -+ udev->ep0.desc.wMaxPacketSize = cpu_to_le16(512); -+ break; -+ case USB_SPEED_HIGH: /* fixed at 64 */ -+ udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64); -+ break; -+ case USB_SPEED_FULL: /* 8, 16, 32, or 64 */ -+ /* to determine the ep0 maxpacket size, try to read -+ * the device descriptor to get bMaxPacketSize0 and -+ * then correct our initial guess. - */ -- switch (udev->speed) { -- case USB_SPEED_SUPER_PLUS: -- case USB_SPEED_SUPER: -- case USB_SPEED_WIRELESS: /* fixed at 512 */ -- udev->ep0.desc.wMaxPacketSize = cpu_to_le16(512); -- break; -- case USB_SPEED_HIGH: /* fixed at 64 */ -- udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64); -- break; -- case USB_SPEED_FULL: /* 8, 16, 32, or 64 */ -- /* to determine the ep0 maxpacket size, try to read -- * the device descriptor to get bMaxPacketSize0 and -- * then correct our initial guess. -- */ -- udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64); -- break; -- case USB_SPEED_LOW: /* fixed at 8 */ -- udev->ep0.desc.wMaxPacketSize = cpu_to_le16(8); -- break; -- default: -- goto fail; -- } -+ udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64); -+ break; -+ case USB_SPEED_LOW: /* fixed at 8 */ -+ udev->ep0.desc.wMaxPacketSize = cpu_to_le16(8); -+ break; -+ default: -+ goto fail; - } - - if (udev->speed == USB_SPEED_WIRELESS) -@@ -4866,24 +4784,22 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - if (udev->speed < USB_SPEED_SUPER) - dev_info(&udev->dev, - "%s %s USB device number %d using %s\n", -- (initial ? "new" : "reset"), speed, -+ (udev->config) ? "reset" : "new", speed, - devnum, driver_name); - -- if (initial) { -- /* Set up TT records, if needed */ -- if (hdev->tt) { -- udev->tt = hdev->tt; -- udev->ttport = hdev->ttport; -- } else if (udev->speed != USB_SPEED_HIGH -- && hdev->speed == USB_SPEED_HIGH) { -- if (!hub->tt.hub) { -- dev_err(&udev->dev, "parent hub has no TT\n"); -- retval = -EINVAL; -- goto fail; -- } -- udev->tt = &hub->tt; -- udev->ttport = port1; -+ /* Set up TT records, if needed */ -+ if (hdev->tt) { -+ udev->tt = hdev->tt; -+ udev->ttport = hdev->ttport; -+ } else if (udev->speed != USB_SPEED_HIGH -+ && hdev->speed == USB_SPEED_HIGH) { -+ if (!hub->tt.hub) { -+ dev_err(&udev->dev, "parent hub has no TT\n"); -+ retval = -EINVAL; -+ goto fail; - } -+ udev->tt = &hub->tt; -+ udev->ttport = port1; - } - - /* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way? -@@ -4902,6 +4818,9 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - - for (retries = 0; retries < GET_DESCRIPTOR_TRIES; (++retries, msleep(100))) { - if (do_new_scheme) { -+ struct usb_device_descriptor *buf; -+ int r = 0; -+ - retval = hub_enable_device(udev); - if (retval < 0) { - dev_err(&udev->dev, -@@ -4910,14 +4829,52 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - goto fail; - } - -- maxp0 = get_bMaxPacketSize0(udev, buf, -- GET_DESCRIPTOR_BUFSIZE, retries == 0); -- if (maxp0 > 0 && !initial && -- maxp0 != udev->descriptor.bMaxPacketSize0) { -- dev_err(&udev->dev, "device reset changed ep0 maxpacket size!\n"); -- retval = -ENODEV; -- goto fail; -+#define GET_DESCRIPTOR_BUFSIZE 64 -+ buf = kmalloc(GET_DESCRIPTOR_BUFSIZE, GFP_NOIO); -+ if (!buf) { -+ retval = -ENOMEM; -+ continue; -+ } -+ -+ /* Retry on all errors; some devices are flakey. -+ * 255 is for WUSB devices, we actually need to use -+ * 512 (WUSB1.0[4.8.1]). -+ */ -+ for (operations = 0; operations < GET_MAXPACKET0_TRIES; -+ ++operations) { -+ buf->bMaxPacketSize0 = 0; -+ r = usb_control_msg(udev, usb_rcvaddr0pipe(), -+ USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, -+ USB_DT_DEVICE << 8, 0, -+ buf, GET_DESCRIPTOR_BUFSIZE, -+ initial_descriptor_timeout); -+ switch (buf->bMaxPacketSize0) { -+ case 8: case 16: case 32: case 64: case 255: -+ if (buf->bDescriptorType == -+ USB_DT_DEVICE) { -+ r = 0; -+ break; -+ } -+ fallthrough; -+ default: -+ if (r == 0) -+ r = -EPROTO; -+ break; -+ } -+ /* -+ * Some devices time out if they are powered on -+ * when already connected. They need a second -+ * reset. But only on the first attempt, -+ * lest we get into a time out/reset loop -+ */ -+ if (r == 0 || (r == -ETIMEDOUT && -+ retries == 0 && -+ udev->speed > USB_SPEED_FULL)) -+ break; - } -+ udev->descriptor.bMaxPacketSize0 = -+ buf->bMaxPacketSize0; -+ kfree(buf); - - retval = hub_port_reset(hub, port1, udev, delay, false); - if (retval < 0) /* error or disconnect */ -@@ -4928,13 +4885,14 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - retval = -ENODEV; - goto fail; - } -- if (maxp0 < 0) { -- if (maxp0 != -ENODEV) -+ if (r) { -+ if (r != -ENODEV) - dev_err(&udev->dev, "device descriptor read/64, error %d\n", -- maxp0); -- retval = maxp0; -+ r); -+ retval = -EMSGSIZE; - continue; - } -+#undef GET_DESCRIPTOR_BUFSIZE - } - - /* -@@ -4980,22 +4938,18 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - break; - } - -- /* !do_new_scheme || wusb */ -- maxp0 = get_bMaxPacketSize0(udev, buf, 8, retries == 0); -- if (maxp0 < 0) { -- retval = maxp0; -+ retval = usb_get_device_descriptor(udev, 8); -+ if (retval < 8) { - if (retval != -ENODEV) - dev_err(&udev->dev, - "device descriptor read/8, error %d\n", - retval); -+ if (retval >= 0) -+ retval = -EMSGSIZE; - } else { - u32 delay; - -- if (!initial && maxp0 != udev->descriptor.bMaxPacketSize0) { -- dev_err(&udev->dev, "device reset changed ep0 maxpacket size!\n"); -- retval = -ENODEV; -- goto fail; -- } -+ retval = 0; - - delay = udev->parent->hub_delay; - udev->hub_delay = min_t(u32, delay, -@@ -5014,61 +4968,48 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - goto fail; - - /* -- * Check the ep0 maxpacket guess and correct it if necessary. -- * maxp0 is the value stored in the device descriptor; -- * i is the value it encodes (logarithmic for SuperSpeed or greater). -+ * Some superspeed devices have finished the link training process -+ * and attached to a superspeed hub port, but the device descriptor -+ * got from those devices show they aren't superspeed devices. Warm -+ * reset the port attached by the devices can fix them. - */ -- i = maxp0; -- if (udev->speed >= USB_SPEED_SUPER) { -- if (maxp0 <= 16) -- i = 1 << maxp0; -- else -- i = 0; /* Invalid */ -- } -- if (usb_endpoint_maxp(&udev->ep0.desc) == i) { -- ; /* Initial ep0 maxpacket guess is right */ -- } else if ((udev->speed == USB_SPEED_FULL || -- udev->speed == USB_SPEED_HIGH) && -- (i == 8 || i == 16 || i == 32 || i == 64)) { -- /* Initial guess is wrong; use the descriptor's value */ -+ if ((udev->speed >= USB_SPEED_SUPER) && -+ (le16_to_cpu(udev->descriptor.bcdUSB) < 0x0300)) { -+ dev_err(&udev->dev, "got a wrong device descriptor, " -+ "warm reset device\n"); -+ hub_port_reset(hub, port1, udev, -+ HUB_BH_RESET_TIME, true); -+ retval = -EINVAL; -+ goto fail; -+ } -+ -+ if (udev->descriptor.bMaxPacketSize0 == 0xff || -+ udev->speed >= USB_SPEED_SUPER) -+ i = 512; -+ else -+ i = udev->descriptor.bMaxPacketSize0; -+ if (usb_endpoint_maxp(&udev->ep0.desc) != i) { -+ if (udev->speed == USB_SPEED_LOW || -+ !(i == 8 || i == 16 || i == 32 || i == 64)) { -+ dev_err(&udev->dev, "Invalid ep0 maxpacket: %d\n", i); -+ retval = -EMSGSIZE; -+ goto fail; -+ } - if (udev->speed == USB_SPEED_FULL) - dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i); - else - dev_warn(&udev->dev, "Using ep0 maxpacket: %d\n", i); - udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i); - usb_ep0_reinit(udev); -- } else { -- /* Initial guess is wrong and descriptor's value is invalid */ -- dev_err(&udev->dev, "Invalid ep0 maxpacket: %d\n", maxp0); -- retval = -EMSGSIZE; -- goto fail; - } - -- descr = usb_get_device_descriptor(udev); -- if (IS_ERR(descr)) { -- retval = PTR_ERR(descr); -+ retval = usb_get_device_descriptor(udev, USB_DT_DEVICE_SIZE); -+ if (retval < (signed)sizeof(udev->descriptor)) { - if (retval != -ENODEV) - dev_err(&udev->dev, "device descriptor read/all, error %d\n", - retval); -- goto fail; -- } -- if (initial) -- udev->descriptor = *descr; -- else -- *dev_descr = *descr; -- kfree(descr); -- -- /* -- * Some superspeed devices have finished the link training process -- * and attached to a superspeed hub port, but the device descriptor -- * got from those devices show they aren't superspeed devices. Warm -- * reset the port attached by the devices can fix them. -- */ -- if ((udev->speed >= USB_SPEED_SUPER) && -- (le16_to_cpu(udev->descriptor.bcdUSB) < 0x0300)) { -- dev_err(&udev->dev, "got a wrong device descriptor, warm reset device\n"); -- hub_port_reset(hub, port1, udev, HUB_BH_RESET_TIME, true); -- retval = -EINVAL; -+ if (retval >= 0) -+ retval = -ENOMSG; - goto fail; - } - -@@ -5094,7 +5035,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, - hub_port_disable(hub, port1, 0); - update_devnum(udev, devnum); /* for disconnect processing */ - } -- kfree(buf); - return retval; - } - -@@ -5175,7 +5115,7 @@ hub_power_remaining(struct usb_hub *hub) - - - static int descriptors_changed(struct usb_device *udev, -- struct usb_device_descriptor *new_device_descriptor, -+ struct usb_device_descriptor *old_device_descriptor, - struct usb_host_bos *old_bos) - { - int changed = 0; -@@ -5186,8 +5126,8 @@ static int descriptors_changed(struct usb_device *udev, - int length; - char *buf; - -- if (memcmp(&udev->descriptor, new_device_descriptor, -- sizeof(*new_device_descriptor)) != 0) -+ if (memcmp(&udev->descriptor, old_device_descriptor, -+ sizeof(*old_device_descriptor)) != 0) - return 1; - - if ((old_bos && !udev->bos) || (!old_bos && udev->bos)) -@@ -5360,7 +5300,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, - } - - /* reset (non-USB 3.0 devices) and get descriptor */ -- status = hub_port_init(hub, udev, port1, i, NULL); -+ status = hub_port_init(hub, udev, port1, i); - if (status < 0) - goto loop; - -@@ -5507,8 +5447,9 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, - { - struct usb_port *port_dev = hub->ports[port1 - 1]; - struct usb_device *udev = port_dev->child; -- struct usb_device_descriptor *descr; -+ struct usb_device_descriptor descriptor; - int status = -ENODEV; -+ int retval; - - dev_dbg(&port_dev->dev, "status %04x, change %04x, %s\n", portstatus, - portchange, portspeed(hub, portstatus)); -@@ -5535,20 +5476,23 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, - * changed device descriptors before resuscitating the - * device. - */ -- descr = usb_get_device_descriptor(udev); -- if (IS_ERR(descr)) { -+ descriptor = udev->descriptor; -+ retval = usb_get_device_descriptor(udev, -+ sizeof(udev->descriptor)); -+ if (retval < 0) { - dev_dbg(&udev->dev, -- "can't read device descriptor %ld\n", -- PTR_ERR(descr)); -+ "can't read device descriptor %d\n", -+ retval); - } else { -- if (descriptors_changed(udev, descr, -+ if (descriptors_changed(udev, &descriptor, - udev->bos)) { - dev_dbg(&udev->dev, - "device descriptor has changed\n"); -+ /* for disconnect() calls */ -+ udev->descriptor = descriptor; - } else { - status = 0; /* Nothing to do */ - } -- kfree(descr); - } - #ifdef CONFIG_PM - } else if (udev->state == USB_STATE_SUSPENDED && -@@ -5986,7 +5930,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) - struct usb_device *parent_hdev = udev->parent; - struct usb_hub *parent_hub; - struct usb_hcd *hcd = bus_to_hcd(udev->bus); -- struct usb_device_descriptor descriptor; -+ struct usb_device_descriptor descriptor = udev->descriptor; - struct usb_host_bos *bos; - int i, j, ret = 0; - int port1 = udev->portnum; -@@ -6018,7 +5962,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) - /* ep0 maxpacket size may change; let the HCD know about it. - * Other endpoints will be handled by re-enumeration. */ - usb_ep0_reinit(udev); -- ret = hub_port_init(parent_hub, udev, port1, i, &descriptor); -+ ret = hub_port_init(parent_hub, udev, port1, i); - if (ret >= 0 || ret == -ENOTCONN || ret == -ENODEV) - break; - } -@@ -6030,6 +5974,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) - /* Device might have changed firmware (DFU or similar) */ - if (descriptors_changed(udev, &descriptor, bos)) { - dev_info(&udev->dev, "device firmware changed\n"); -+ udev->descriptor = descriptor; /* for disconnect() calls */ - goto re_enumerate; - } - -diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index 678c43234d65f..e8045997d6ec2 100644 ---- a/drivers/usb/core/message.c -+++ b/drivers/usb/core/message.c -@@ -1039,35 +1039,40 @@ char *usb_cache_string(struct usb_device *udev, int index) - } - - /* -- * usb_get_device_descriptor - read the device descriptor -- * @udev: the device whose device descriptor should be read -+ * usb_get_device_descriptor - (re)reads the device descriptor (usbcore) -+ * @dev: the device whose device descriptor is being updated -+ * @size: how much of the descriptor to read - * - * Context: task context, might sleep. - * -+ * Updates the copy of the device descriptor stored in the device structure, -+ * which dedicates space for this purpose. -+ * - * Not exported, only for use by the core. If drivers really want to read - * the device descriptor directly, they can call usb_get_descriptor() with - * type = USB_DT_DEVICE and index = 0. - * -- * Returns: a pointer to a dynamically allocated usb_device_descriptor -- * structure (which the caller must deallocate), or an ERR_PTR value. -+ * This call is synchronous, and may not be used in an interrupt context. -+ * -+ * Return: The number of bytes received on success, or else the status code -+ * returned by the underlying usb_control_msg() call. - */ --struct usb_device_descriptor *usb_get_device_descriptor(struct usb_device *udev) -+int usb_get_device_descriptor(struct usb_device *dev, unsigned int size) - { - struct usb_device_descriptor *desc; - int ret; - -+ if (size > sizeof(*desc)) -+ return -EINVAL; - desc = kmalloc(sizeof(*desc), GFP_NOIO); - if (!desc) -- return ERR_PTR(-ENOMEM); -- -- ret = usb_get_descriptor(udev, USB_DT_DEVICE, 0, desc, sizeof(*desc)); -- if (ret == sizeof(*desc)) -- return desc; -+ return -ENOMEM; - -+ ret = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, size); - if (ret >= 0) -- ret = -EMSGSIZE; -+ memcpy(&dev->descriptor, desc, size); - kfree(desc); -- return ERR_PTR(ret); -+ return ret; - } - - /* -diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h -index 3bb2e1db42b5d..82538daac8b89 100644 ---- a/drivers/usb/core/usb.h -+++ b/drivers/usb/core/usb.h -@@ -42,8 +42,8 @@ extern bool usb_endpoint_is_ignored(struct usb_device *udev, - struct usb_endpoint_descriptor *epd); - extern int usb_remove_device(struct usb_device *udev); - --extern struct usb_device_descriptor *usb_get_device_descriptor( -- struct usb_device *udev); -+extern int usb_get_device_descriptor(struct usb_device *dev, -+ unsigned int size); - extern int usb_set_isoch_delay(struct usb_device *dev); - extern int usb_get_bos_descriptor(struct usb_device *dev); - extern void usb_release_bos_descriptor(struct usb_device *dev); --- -2.37.3 - diff --git 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 index da7acca21..1b75eae16 100644 --- 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,5 +1,4 @@ -From 808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9 Mon Sep 17 00:00:00 2001 -Message-ID: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 2acf7bc2a2b2a1e575aa6cfe8e8215ff1c0a35ae Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 11 Apr 2022 14:47:59 +0200 Subject: [PATCH] ARM: dts: bcm2711: Add device tree for Home Assistant Yellow @@ -9,31 +8,18 @@ board. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/Makefile | 1 + - .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 587 ++++++++++++++++++ + .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 587 ++++++++++++++++++ arch/arm64/boot/dts/broadcom/Makefile | 1 + .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 1 + - 4 files changed, 590 insertions(+) - create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts + 3 files changed, 589 insertions(+) + create mode 100644 arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index d12432ec2554..38351b107814 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -18,6 +18,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ - bcm2709-rpi-cm2.dtb \ - bcm2710-rpi-cm3.dtb \ - bcm2711-rpi-cm4.dtb \ -+ bcm2711-rpi-cm4-ha-yellow.dtb \ - bcm2711-rpi-cm4s.dtb \ - bcm2712-rpi-5-b.dtb - -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 new file mode 100644 -index 000000000000..f92936d7cf16 +index 0000000000000..f92936d7cf16b --- /dev/null -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts @@ -0,0 +1,587 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; @@ -623,24 +609,21 @@ index 000000000000..f92936d7cf16 + }; +}; diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index effdc7137c11..ba3e56723985 100644 +index 6dd8659a7d8a8..9d17e60dc33f7 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile -@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb +@@ -19,6 +19,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.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 dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4s.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2712-rpi-5-b.dtb - + dtb-$(CONFIG_ARCH_BCM2835) += bcm2712d0-rpi-5-b.dtb diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts new file mode 100644 -index 000000000000..fdc5ec5bc956 +index 0000000000000..97ff67ade14d9 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts @@ -0,0 +1 @@ -+#include "../../../../arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts" --- -2.42.0 - ++#include "../../../../arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts" diff --git 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 index dddfb2fd7..ad0f2bd25 100644 --- 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,7 +1,4 @@ -From e46bcfa7e1b577be494024b05c2b310f10a037c2 Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 7bc3b341d90c95dc17d3da0930801006b00d2046 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 4 Mar 2021 14:33:09 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio module @@ -10,13 +7,13 @@ Enable UART4 by default and mux pins including hardware flow control. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 16 ++++++++++++++-- + .../dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index f92936d7cf16..fa93ab5ca639 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 f92936d7cf16b..fa93ab5ca639b 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 @@ -15,6 +15,10 @@ / { compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711"; model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow"; @@ -55,6 +52,3 @@ index f92936d7cf16..fa93ab5ca639 100644 }; uart5_pins: uart5_pins { --- -2.42.0 - diff --git 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 index d88ad4828..d84e4c448 100644 --- 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,20 +1,17 @@ -From aa2d31d8148440ca6e981c9793695dea056baeff Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 65dd5542d4baf35595fc85cd7a9e0aa51dc371cc Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 4 Mar 2021 14:44:23 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux debug UART5 Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 9 +++++++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index fa93ab5ca639..cc7e7b28ffc7 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 fa93ab5ca639b..cc7e7b28ffc76 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 @@ -17,6 +17,7 @@ / { aliases { @@ -45,6 +42,3 @@ index fa93ab5ca639..cc7e7b28ffc7 100644 }; aliases { --- -2.42.0 - diff --git 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 index 3056ac6a3..623a8d710 100644 --- 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,7 +1,4 @@ -From 746ef4ac4f691fe588f8fd7947a900d616f74e5b Mon Sep 17 00:00:00 2001 -Message-ID: <746ef4ac4f691fe588f8fd7947a900d616f74e5b.1698393299.git.stefan@agner.ch> -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 68b50046140a36790b004005b6305820de80520b Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 4 Mar 2021 14:48:48 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: Enable I2C6 by default @@ -10,13 +7,13 @@ The main I2C bus used on Yellow is I2C6. Enable it by default. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 6 ++++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index cc7e7b28ffc7..72f437f4e81a 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 cc7e7b28ffc76..72f437f4e81a1 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 @@ -510,6 +510,12 @@ &i2c1 { clock-frequency = <100000>; }; @@ -30,6 +27,3 @@ index cc7e7b28ffc7..72f437f4e81a 100644 &i2s { pinctrl-names = "default"; pinctrl-0 = <&i2s_pins>; --- -2.42.0 - diff --git 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 index 07c1608dd..a1c4282d7 100644 --- 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,7 +1,4 @@ -From da56dbf0ce913c49bde27bd9196e68a4a2c38d66 Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From fef283110d29ff46fba6f1b2d24519128ce8a79b Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 4 Mar 2021 17:19:01 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: add I2S audio codec @@ -10,13 +7,13 @@ Add TI PCM5122 I2S audio codec. Signed-off-by: Stefan Agner --- - .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 26 +++++++++++++++++++ + .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index 72f437f4e81a..8ca65c696531 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 72f437f4e81a1..8ca65c696531f 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 @@ -514,11 +514,22 @@ &i2c6 { pinctrl-names = "default"; pinctrl-0 = <&i2c6_pins>; @@ -62,6 +59,3 @@ index 72f437f4e81a..8ca65c696531 100644 &vchiq { pinctrl-names = "default"; pinctrl-0 = <&audio_pins>; --- -2.42.0 - diff --git 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 index bbb46a45c..0f92a0d65 100644 --- 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,20 +1,17 @@ -From 05d15d41fcd7b94521cb93a696ba25174627adfc Mon Sep 17 00:00:00 2001 -Message-ID: <05d15d41fcd7b94521cb93a696ba25174627adfc.1698393299.git.stefan@agner.ch> -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 813ead66c6b09ce9eaab57b5ab6907314226368a Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 9 Mar 2021 15:02:53 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: enable GPIO keys Signed-off-by: Stefan Agner --- - .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 31 +++++++++++++++++++ + .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index 8ca65c696531..dcc36efcdcb1 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 8ca65c696531f..dcc36efcdcb14 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 @@ -11,6 +11,8 @@ #undef i2c0 //#include "bcm283x-rpi-usb-peripheral.dtsi" @@ -67,6 +64,3 @@ index 8ca65c696531..dcc36efcdcb1 100644 spi0_pins: spi0_pins { brcm,pins = <9 10 11>; brcm,function = ; --- -2.42.0 - diff --git 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 index 22f3dfce5..450f6c232 100644 --- 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,7 +1,4 @@ -From bc62fb721d663f63c9b44371d875e6c52d5d6126 Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From e738be24b35b8c8df6e5149a64ad9c366c27ba59 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 28 Oct 2021 19:38:04 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: add user LED @@ -10,13 +7,13 @@ Add yellow user LED. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 7 ++++++- + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index dcc36efcdcb1..6cdf595cdc2c 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 dcc36efcdcb14..6cdf595cdc2c3 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 @@ -315,7 +315,6 @@ soc { #include "bcm2711-rpi-ds.dtsi" #include "bcm283x-rpi-csi0-2lane.dtsi" @@ -38,6 +35,3 @@ index dcc36efcdcb1..6cdf595cdc2c 100644 }; &pwm1 { --- -2.42.0 - diff --git 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 index f72c39cdc..5a9ca16c0 100644 --- 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,20 +1,17 @@ -From 0dd0356291e2cd2921c3e20e920a8d0f7f4832c6 Mon Sep 17 00:00:00 2001 -Message-ID: <0dd0356291e2cd2921c3e20e920a8d0f7f4832c6.1698393299.git.stefan@agner.ch> -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 1ac9e238e1e9ec9c7cfc8dc84304a6949fe1d958 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 12 Nov 2021 17:33:32 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 5 +++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index 6cdf595cdc2c..e867da211c9f 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 6cdf595cdc2c3..e867da211c9fc 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 @@ -554,6 +554,11 @@ card_codec: pcm5121@4c { CPVDD-supply = <&vdd_3v3_reg>; status = "okay"; @@ -27,6 +24,3 @@ index 6cdf595cdc2c..e867da211c9f 100644 }; &i2s { --- -2.42.0 - diff --git 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 index 940fd8768..862055751 100644 --- 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,7 +1,4 @@ -From 0a2890e4584562471b2568220605bbc35604b17d Mon Sep 17 00:00:00 2001 -Message-ID: <0a2890e4584562471b2568220605bbc35604b17d.1698393299.git.stefan@agner.ch> -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 124e2b8e4b7ebda8acc488704fe11c5bf5e44bd1 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 7 Jan 2022 17:10:00 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: enable USB host mode by default @@ -11,13 +8,13 @@ Assistant Yellow has a USB hub and USB ports connected to it. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 9 +++++++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index e867da211c9f..3866192a6f47 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 e867da211c9fc..3866192a6f477 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 @@ -578,6 +578,15 @@ &sdhost { status = "disabled"; }; @@ -34,6 +31,3 @@ index e867da211c9f..3866192a6f47 100644 &phy1 { led-modes = <0x00 0x08>; /* link/activity link */ }; --- -2.42.0 - diff --git 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 index 1781f3dd7..506d541da 100644 --- 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,7 +1,4 @@ -From f9291af2fba355e8ce432e5530adde568b51f9e6 Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 68f9deead3ac327dadd096e004d24a6166f57158 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 27 Apr 2022 20:36:19 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: use generic activity trigger for @@ -12,13 +9,13 @@ system activity is shown. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 2 +- + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index 3866192a6f47..11da9ec9b828 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 3866192a6f477..11da9ec9b828a 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 @@ -602,7 +602,7 @@ &leds { act_led: led-act { label = "led0"; @@ -28,6 +25,3 @@ index 3866192a6f47..11da9ec9b828 100644 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; --- -2.42.0 - diff --git 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 index 20f17ca2a..49c4c7a44 100644 --- 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,7 +1,4 @@ -From cd5035e6a9105967200b46876ab35aca26cfa958 Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 06b9732139c9dfa46beb4cc56992f2104a528b54 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 26 Jul 2022 15:53:59 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: use USB OTG mode by default @@ -11,13 +8,13 @@ peripheral (e.g. in U-Boot via UMS command). Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 2 +- + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index 11da9ec9b828..fa2b96e31a4f 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 11da9ec9b828a..fa2b96e31a4f0 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 @@ -580,7 +580,7 @@ &sdhost { &usb { @@ -27,6 +24,3 @@ index 11da9ec9b828..fa2b96e31a4f 100644 g-np-tx-fifo-size = <32>; g-rx-fifo-size = <558>; g-tx-fifo-size = <512 512 512 512 512 256 256>; --- -2.42.0 - diff --git 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 index b41768959..8bc9af4e2 100644 --- 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,7 +1,4 @@ -From 17feb0a73ace80468b64cf52991a5b91e224a4f9 Mon Sep 17 00:00:00 2001 -Message-ID: <17feb0a73ace80468b64cf52991a5b91e224a4f9.1698393299.git.stefan@agner.ch> -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From d889b7cf38a0ea4990c91380d7c911ed3c9fab5b Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 30 Jul 2022 11:21:31 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: Add LED overrides @@ -10,13 +7,13 @@ Add device tree overrides for all three LEDs. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 15 ++++++++------- + .../dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index fa2b96e31a4f..f7fdf8bbb395 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 fa2b96e31a4f0..f7fdf8bbb395a 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 @@ -600,22 +600,24 @@ audio_pins: audio_pins { &leds { @@ -63,6 +60,3 @@ index fa2b96e31a4f..f7fdf8bbb395 100644 eth_led0 = <&phy1>,"led-modes:0"; eth_led1 = <&phy1>,"led-modes:4"; --- -2.42.0 - diff --git 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 index a05edb374..30b5ea67f 100644 --- 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,7 +1,4 @@ -From 4b9ccb624cb498b63475662c041c3efc4b230731 Mon Sep 17 00:00:00 2001 -Message-ID: <4b9ccb624cb498b63475662c041c3efc4b230731.1698393299.git.stefan@agner.ch> -In-Reply-To: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> -References: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> +From 614ff7a7904a769dee144ae4cf80e484d8ffade5 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 31 May 2023 10:57:43 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: use serial alias to enumerate @@ -12,13 +9,13 @@ make sure to correctly enumerate the serial aliases. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 8 ++------ + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index f7fdf8bbb395..b8f0bc2df062 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 f7fdf8bbb395a..b8f0bc2df062d 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 @@ -17,11 +17,6 @@ / { compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711"; model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow"; @@ -41,6 +38,3 @@ index f7fdf8bbb395..b8f0bc2df062 100644 mmc0 = &emmc2; mmc1 = &mmcnr; mmc2 = &sdhost; --- -2.42.0 - diff --git 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 index bc66cfb45..468865c18 100644 --- 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 169075818f13e77f4d86c913bbac796e92bb5b14 Mon Sep 17 00:00:00 2001 +From 1743e9e6cf20309f9096489930543576a8297c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 16 Nov 2023 12:46:48 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: Use mini-UART for Bluetooth by @@ -14,13 +14,13 @@ Full UART should be available on J11. Signed-off-by: Jan Čermák --- - .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 36 ++++++++++++++----- + .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -index b8f0bc2df062..26033f2d30d0 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +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 b8f0bc2df062d..26033f2d30d0c 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 @@ -318,7 +318,7 @@ chosen { }; @@ -99,6 +99,3 @@ index b8f0bc2df062..26033f2d30d0 100644 + krnbt = <&minibt>,"status"; }; }; --- -2.34.1 - diff --git 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 new file mode 100644 index 000000000..2a078496f --- /dev/null +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0015-ARM-dts-bcm2711-yellow-Fix-leds-node-referencing-aft.patch @@ -0,0 +1,41 @@ +From 0f005f5b3182e8ecb745f535a1bfeef31c3bfa5b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= +Date: Tue, 9 Apr 2024 14:18:17 +0200 +Subject: [PATCH] ARM: dts: bcm2711: yellow: Fix leds node referencing after + included dtsi changes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After a change [1] in the included bcm2835-rpi.dtsi it is no longer possible to +reference leds node and the compatible string is missing. It was moved to +bcm283x-rpi-led-deprecated.dtsi, but instead of including that, take over +control and define it in Yellow DTS (like it's done e.g. for RPi 5 DTS). + +[1] https://lore.kernel.org/all/20221110173105.6633-3-stefan.wahren@i2se.com/ + +Signed-off-by: Jan Čermák +--- + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 7 ++++++- + 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 +--- 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 { + }; + }; + +- leds { ++ leds: leds { ++ compatible = "gpio-leds"; ++ + led-act { ++ label = "ACT"; + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; ++ default-state = "keep"; ++ linux,default-trigger = "heartbeat"; + }; + + led-pwr { diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index f032809db..fc346a444 100644 --- 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_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y @@ -19,12 +19,12 @@ 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_20240124.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6f16847710cc0502450788b9f12f0a14d3429668.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.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.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_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b bcm2710-rpi-2-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 19909ea13..ab3e7746b 100644 --- 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_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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_20240124.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6f16847710cc0502450788b9f12f0a14d3429668.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.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.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_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-zero-2" diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index d8d5c3cdb..70c93dcbc 100644 --- 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_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y @@ -19,12 +19,12 @@ 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_20240124.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6f16847710cc0502450788b9f12f0a14d3429668.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.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.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_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3 bcm2710-rpi-zero-2-w" +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-w" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index ab1c25a8f..59e9455a7 100644 --- 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_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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_20240124.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6f16847710cc0502450788b9f12f0a14d3429668.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.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.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_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" diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index 99ba908f7..d9b24d143 100644 --- 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_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y @@ -19,12 +19,12 @@ 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_20240124.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6f16847710cc0502450788b9f12f0a14d3429668.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.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.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_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" diff --git a/buildroot-external/configs/rpi5_64_defconfig b/buildroot-external/configs/rpi5_64_defconfig index 141a72778..99d52adb3 100644 --- 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_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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_20240124.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6f16847710cc0502450788b9f12f0a14d3429668.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.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.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_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index 7f3bb0995..73334bd1d 100644 --- 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_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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_20240124.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6f16847710cc0502450788b9f12f0a14d3429668.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.1.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.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_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4-ha-yellow" diff --git a/buildroot-external/kernel/v6.1.y/device-support-pci.config b/buildroot-external/kernel/v6.1.y/device-support-pci.config deleted file mode 100644 index b574437ed..000000000 --- a/buildroot-external/kernel/v6.1.y/device-support-pci.config +++ /dev/null @@ -1,38 +0,0 @@ -CONFIG_IGB=y -CONFIG_IGC=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 - -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 diff --git a/buildroot-external/kernel/v6.1.y/device-support-wireless-pci.config b/buildroot-external/kernel/v6.1.y/device-support-wireless-pci.config deleted file mode 100644 index 245819a29..000000000 --- a/buildroot-external/kernel/v6.1.y/device-support-wireless-pci.config +++ /dev/null @@ -1,50 +0,0 @@ -# This fragment contains configuration options for WiFi drivers that are -# using PCI or PCIe bus. The device-support-wireless.config fragment must -# be included for this one to work as well as it contains common options. - -# Atheros drivers -CONFIG_ATH5K=m -CONFIG_ATH5K_PCI=y -CONFIG_ATH10K_PCI=m -CONFIG_ATH11K=m -CONFIG_ATH11K_PCI=m - -# Broadcom drivers -CONFIG_BRCMFMAC_PCIE=y - -# Intel drivers -CONFIG_IWLEGACY=m -CONFIG_IWL3945=m -CONFIG_IWL4965=m -CONFIG_IWLWIFI=m -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m - -# Marvell drivers -CONFIG_MWIFIEX_PCIE=m -CONFIG_MWL8K=m - -# Mediatek drivers -CONFIG_MT7603E=m -CONFIG_MT7615E=m -CONFIG_MT7915E=m -CONFIG_MT7921E=m - -# Ralink drivers -CONFIG_RT2800PCI=m - -# Realtek drivers -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8723BE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192EE=m -CONFIG_RTL8821AE=m -CONFIG_RTW88_8822BE=m -CONFIG_RTW88_8822CE=m -CONFIG_RTW88_8723DE=m -CONFIG_RTW88_8821CE=m -CONFIG_RTW89_8852AE=m -CONFIG_RTW89_8852CE=m diff --git a/buildroot-external/kernel/v6.1.y/device-support-wireless.config b/buildroot-external/kernel/v6.1.y/device-support-wireless.config deleted file mode 100644 index f2d22f388..000000000 --- a/buildroot-external/kernel/v6.1.y/device-support-wireless.config +++ /dev/null @@ -1,73 +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_RTW89=m - -# Staging drivers -CONFIG_STAGING=y -CONFIG_RTL8723BS=m -CONFIG_R8188EU=m diff --git a/buildroot-external/kernel/v6.1.y/device-support.config b/buildroot-external/kernel/v6.1.y/device-support.config deleted file mode 100644 index 123450e25..000000000 --- a/buildroot-external/kernel/v6.1.y/device-support.config +++ /dev/null @@ -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_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_COMMON=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 diff --git a/buildroot-external/kernel/v6.1.y/docker.config b/buildroot-external/kernel/v6.1.y/docker.config deleted file mode 100644 index 3e80bc7f3..000000000 --- a/buildroot-external/kernel/v6.1.y/docker.config +++ /dev/null @@ -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 diff --git a/buildroot-external/kernel/v6.1.y/hassos.config b/buildroot-external/kernel/v6.1.y/hassos.config deleted file mode 100644 index 82bea7a05..000000000 --- a/buildroot-external/kernel/v6.1.y/hassos.config +++ /dev/null @@ -1,201 +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_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_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_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_OBJREF=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_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 diff --git a/buildroot-external/patches/linux/6.6.25/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch b/buildroot-external/patches/linux/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch similarity index 100% rename from buildroot-external/patches/linux/6.6.25/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch rename to buildroot-external/patches/linux/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch diff --git a/buildroot-external/patches/linux/6.6.25/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch b/buildroot-external/patches/linux/6.6.25/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch deleted file mode 100644 index 2e82302b3..000000000 --- a/buildroot-external/patches/linux/6.6.25/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 76591e4075194cf717dc085b8285912f706bcd46 Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Tue, 28 Mar 2023 12:02:10 +0200 -Subject: [PATCH] ipv6: add option to explicitly enable reachability test - -Systems which act as host as well as router might prefer the host -behavior. Currently the kernel does not allow to use IPv6 forwarding -globally and at the same time use route reachability probing. - -Add a compile time flag to enable route reachability probe in any -case. - -Signed-off-by: Stefan Agner ---- - net/ipv6/Kconfig | 9 +++++++++ - net/ipv6/route.c | 3 ++- - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig -index 08d4b7132d4c..242bf2eeb7ae 100644 ---- a/net/ipv6/Kconfig -+++ b/net/ipv6/Kconfig -@@ -48,6 +48,15 @@ config IPV6_OPTIMISTIC_DAD - - If unsure, say N. - -+config IPV6_REACHABILITY_PROBE -+ bool "IPv6: Always use reachability probing (RFC 4191)" -+ help -+ By default reachability probing is disabled on router devices (when -+ IPv6 forwarding is enabled). This option explicitly enables -+ reachability probing always. -+ -+ If unsure, say N. -+ - config INET6_AH - tristate "IPv6: AH transformation" - select XFRM_AH -diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 56525b5b95a2..916769b9a772 100644 ---- a/net/ipv6/route.c -+++ b/net/ipv6/route.c -@@ -2211,7 +2211,8 @@ 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 (net->ipv6.devconf_all->forwarding == 0 || -+ IS_ENABLED(CONFIG_IPV6_REACHABILITY_PROBE)) - strict |= RT6_LOOKUP_F_REACHABLE; - - rcu_read_lock();