From 252887cc0d3424ed1c17ce6626dc943fc9eaef18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 27 Oct 2023 11:16:27 +0200 Subject: [PATCH] RaspberryPi: Update kernel 6.1.58 - stable_20231024 (#2864) * RaspberryPi: Update kernel 6.1.58 - stable_20231024 * Remove unnecessary Bluetooth patch * Rebase Yellow patchset --------- Co-authored-by: Stefan Agner --- Documentation/kernel.md | 12 ++-- ...nc-Fix-handling-of-HCI_QUIRK_STRICT_.patch | 60 ------------------- ...Add-device-tree-for-Home-Assistant-Y.patch | 32 +++++----- ...yellow-Mux-UART4-for-SiLabs-radio-mo.patch | 10 ++-- ...M-dts-bcm2711-yellow-Mux-debug-UART5.patch | 10 ++-- ...cm2711-yellow-Enable-I2C6-by-default.patch | 10 ++-- ...s-bcm2711-yellow-add-I2S-audio-codec.patch | 10 ++-- ...-dts-bcm2711-yellow-enable-GPIO-keys.patch | 10 ++-- ...-ARM-dts-bcm2711-yellow-add-user-LED.patch | 10 ++-- ...bcm2711-yellow-add-NXP-PCF85063A-RTC.patch | 10 ++-- ...yellow-enable-USB-host-mode-by-defau.patch | 10 ++-- ...yellow-use-generic-activity-trigger-.patch | 10 ++-- ...1-yellow-use-USB-OTG-mode-by-default.patch | 10 ++-- ...dts-bcm2711-yellow-Add-LED-overrides.patch | 10 ++-- ...ellow-use-serial-alias-to-enumerate.patch} | 10 ++-- ...1-Don-t-use-DT-aliases-for-numbering.patch | 56 ----------------- ...ellow-Use-mini-UART-for-Bluetooth-b.patch} | 10 ++-- buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi4_64_defconfig | 2 +- buildroot-external/configs/rpi4_defconfig | 2 +- buildroot-external/configs/yellow_defconfig | 2 +- 23 files changed, 92 insertions(+), 210 deletions(-) delete mode 100644 buildroot-external/board/raspberrypi/patches/linux/0001-Bluetooth-hci_sync-Fix-handling-of-HCI_QUIRK_STRICT_.patch rename buildroot-external/board/raspberrypi/yellow/patches/linux/{0014-ARM-dts-bcm2711-yellow-use-serial-alias-to-enumerate.patch => 0013-ARM-dts-bcm2711-yellow-use-serial-alias-to-enumerate.patch} (81%) delete mode 100644 buildroot-external/board/raspberrypi/yellow/patches/linux/0013-Revert-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch rename buildroot-external/board/raspberrypi/yellow/patches/linux/{0015-ARM-dts-bcm2711-yellow-Use-mini-UART-for-Bluetooth-b.patch => 0014-ARM-dts-bcm2711-yellow-Use-mini-UART-for-Bluetooth-b.patch} (86%) diff --git a/Documentation/kernel.md b/Documentation/kernel.md index 85524d1a8..ee3091cae 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -6,12 +6,12 @@ Default Kernel tree: 6.1 | Board | Version | |-------|---------| | Open Virtual Appliance | 6.1.60 | -| Raspberry Pi | 6.1.21 | -| Raspberry Pi 0-W | 6.1.21 | -| Raspberry Pi 2 | 6.1.21 | -| Raspberry Pi 3 | 6.1.21 | -| Raspberry Pi 4 | 6.1.21 | -| Home Assistant Yellow | 6.1.21 | +| Raspberry Pi | 6.1.58 | +| Raspberry Pi 0-W | 6.1.58 | +| Raspberry Pi 2 | 6.1.58 | +| Raspberry Pi 3 | 6.1.58 | +| Raspberry Pi 4 | 6.1.58 | +| Home Assistant Yellow | 6.1.58 | | Home Assistant Green | 6.1.60 | | Tinker Board | 6.1.60 | | ODROID-C2 | 6.1.60 | diff --git a/buildroot-external/board/raspberrypi/patches/linux/0001-Bluetooth-hci_sync-Fix-handling-of-HCI_QUIRK_STRICT_.patch b/buildroot-external/board/raspberrypi/patches/linux/0001-Bluetooth-hci_sync-Fix-handling-of-HCI_QUIRK_STRICT_.patch deleted file mode 100644 index a436b57f8..000000000 --- a/buildroot-external/board/raspberrypi/patches/linux/0001-Bluetooth-hci_sync-Fix-handling-of-HCI_QUIRK_STRICT_.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b93f2a3748f32cde4a09cade7948bb406a2a4091 Mon Sep 17 00:00:00 2001 -Message-ID: -From: Luiz Augusto von Dentz -Date: Tue, 29 Aug 2023 13:59:36 -0700 -Subject: [PATCH] Bluetooth: hci_sync: Fix handling of - HCI_QUIRK_STRICT_DUPLICATE_FILTER - -When HCI_QUIRK_STRICT_DUPLICATE_FILTER is set LE scanning requires -periodic restarts of the scanning procedure as the controller would -consider device previously found as duplicated despite of RSSI changes, -but in order to set the scan timeout properly set le_scan_restart needs -to be synchronous so it shall not use hci_cmd_sync_queue which defers -the command processing to cmd_sync_work. - -link: https://lore.kernel.org/linux-bluetooth/578e6d7afd676129decafba846a933f5@agner.ch/#t -Fixes: 27d54b778ad1 ("Bluetooth: Rework le_scan_restart for hci_sync") -Signed-off-by: Luiz Augusto von Dentz ---- - net/bluetooth/hci_sync.c | 13 ++++--------- - 1 file changed, 4 insertions(+), 9 deletions(-) - -diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c -index 2ae038dfc39f..f8bb2504f99a 100644 ---- a/net/bluetooth/hci_sync.c -+++ b/net/bluetooth/hci_sync.c -@@ -412,11 +412,6 @@ static int hci_le_scan_restart_sync(struct hci_dev *hdev) - LE_SCAN_FILTER_DUP_ENABLE); - } - --static int le_scan_restart_sync(struct hci_dev *hdev, void *data) --{ -- return hci_le_scan_restart_sync(hdev); --} -- - static void le_scan_restart(struct work_struct *work) - { - struct hci_dev *hdev = container_of(work, struct hci_dev, -@@ -426,15 +421,15 @@ static void le_scan_restart(struct work_struct *work) - - bt_dev_dbg(hdev, ""); - -- hci_dev_lock(hdev); -- -- status = hci_cmd_sync_queue(hdev, le_scan_restart_sync, NULL, NULL); -+ status = hci_le_scan_restart_sync(hdev); - if (status) { - bt_dev_err(hdev, "failed to restart LE scan: status %d", - status); -- goto unlock; -+ return; - } - -+ hci_dev_lock(hdev); -+ - if (!test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks) || - !hdev->discovery.scan_start) - goto unlock; --- -2.42.0 - 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 a3f9a8a68..da7acca21 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,5 @@ -From f0292972b38d512fce48384ebbb72b2da46f03bd Mon Sep 17 00:00:00 2001 -Message-Id: +From 808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9 Mon Sep 17 00:00:00 2001 +Message-ID: <808c5caa6bdefaadf7c63d9fb5c18c33dc1fe5b9.1698393299.git.stefan@agner.ch> 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,28 +9,26 @@ board. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/Makefile | 1 + .../boot/dts/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, 591 insertions(+), 1 deletion(-) + 4 files changed, 590 insertions(+) create mode 100644 arch/arm/boot/dts/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 f7d8d09c0a16..3a7d6595aded 100644 +index d12432ec2554..38351b107814 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -18,7 +18,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ +@@ -18,6 +18,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2709-rpi-cm2.dtb \ bcm2710-rpi-cm3.dtb \ bcm2711-rpi-cm4.dtb \ -- bcm2711-rpi-cm4s.dtb -+ bcm2711-rpi-cm4s.dtb \ -+ bcm2711-rpi-cm4-ha-yellow.dtb ++ bcm2711-rpi-cm4-ha-yellow.dtb \ + bcm2711-rpi-cm4s.dtb \ + bcm2712-rpi-5-b.dtb - dtb-$(CONFIG_ARCH_ALPINE) += \ - alpine-db.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 new file mode 100644 index 000000000000..f92936d7cf16 @@ -625,17 +623,17 @@ index 000000000000..f92936d7cf16 + }; +}; diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index 9b678d144085..7c1a67f7c028 100644 +index effdc7137c11..ba3e56723985 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile -@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb +@@ -15,6 +15,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-cm4s.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 - subdir-y += bcmbca - subdir-y += northstar2 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 @@ -644,5 +642,5 @@ index 000000000000..fdc5ec5bc956 @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts" -- -2.39.1 +2.42.0 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 3c70c8541..dddfb2fd7 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,7 @@ -From c07db9fb0a6a9779aadc7c8cc4c83c87c83b2ad4 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Thu, 4 Mar 2021 14:33:09 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio module @@ -56,5 +56,5 @@ index f92936d7cf16..fa93ab5ca639 100644 uart5_pins: uart5_pins { -- -2.39.1 +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 c508be9bf..d88ad4828 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,7 +1,7 @@ -From e12a021cbc1c474580d68e3593ce86d10ffc0232 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Thu, 4 Mar 2021 14:44:23 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux debug UART5 @@ -46,5 +46,5 @@ index fa93ab5ca639..cc7e7b28ffc7 100644 aliases { -- -2.39.1 +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 f858bdf46..3056ac6a3 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,7 @@ -From fa80760de4f8d2cdb13167f2a480581c319a7c2d Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Thu, 4 Mar 2021 14:48:48 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: Enable I2C6 by default @@ -31,5 +31,5 @@ index cc7e7b28ffc7..72f437f4e81a 100644 pinctrl-names = "default"; pinctrl-0 = <&i2s_pins>; -- -2.39.1 +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 bd9cc2025..07c1608dd 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,7 @@ -From e83a7bddbe8981c96837b0258f07230e1a93e907 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Thu, 4 Mar 2021 17:19:01 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: add I2S audio codec @@ -63,5 +63,5 @@ index 72f437f4e81a..8ca65c696531 100644 pinctrl-names = "default"; pinctrl-0 = <&audio_pins>; -- -2.39.1 +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 77df2fb82..bbb46a45c 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,7 +1,7 @@ -From ee53448bf22dec674655ed7bdb433e401bb06e68 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Tue, 9 Mar 2021 15:02:53 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: enable GPIO keys @@ -68,5 +68,5 @@ index 8ca65c696531..dcc36efcdcb1 100644 brcm,pins = <9 10 11>; brcm,function = ; -- -2.39.1 +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 06522afcd..22f3dfce5 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,7 @@ -From 04601aebe965d7b153e548028a44b2c46159b657 Mon Sep 17 00:00:00 2001 -Message-Id: <04601aebe965d7b153e548028a44b2c46159b657.1677499716.git.stefan@agner.ch> -In-Reply-To: -References: +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: Stefan Agner Date: Thu, 28 Oct 2021 19:38:04 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: add user LED @@ -39,5 +39,5 @@ index dcc36efcdcb1..6cdf595cdc2c 100644 &pwm1 { -- -2.39.1 +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 23f605569..f72c39cdc 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,7 +1,7 @@ -From ef2877f999685caa678e34493d5dcfa1f55a28a8 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Fri, 12 Nov 2021 17:33:32 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC @@ -28,5 +28,5 @@ index 6cdf595cdc2c..e867da211c9f 100644 &i2s { -- -2.39.1 +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 c7a035f54..940fd8768 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,7 @@ -From d9881c68f4263460ec2eee718ce8e2b3ed3eea9a Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Fri, 7 Jan 2022 17:10:00 +0100 Subject: [PATCH] ARM: dts: bcm2711: yellow: enable USB host mode by default @@ -35,5 +35,5 @@ index e867da211c9f..3866192a6f47 100644 led-modes = <0x00 0x08>; /* link/activity link */ }; -- -2.39.1 +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 1432694ca..1781f3dd7 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,7 @@ -From d5f3fd27c65fb9ce56184f49c3001f2ef86f4e88 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Wed, 27 Apr 2022 20:36:19 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: use generic activity trigger for @@ -29,5 +29,5 @@ index 3866192a6f47..11da9ec9b828 100644 }; -- -2.39.1 +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 c3dd42d9d..20f17ca2a 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,7 @@ -From 36e8909a2dbfb10fc34df9f606ff3f7f612027f3 Mon Sep 17 00:00:00 2001 -Message-Id: <36e8909a2dbfb10fc34df9f606ff3f7f612027f3.1677499716.git.stefan@agner.ch> -In-Reply-To: -References: +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: Stefan Agner Date: Tue, 26 Jul 2022 15:53:59 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: use USB OTG mode by default @@ -28,5 +28,5 @@ index 11da9ec9b828..fa2b96e31a4f 100644 g-rx-fifo-size = <558>; g-tx-fifo-size = <512 512 512 512 512 256 256>; -- -2.39.1 +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 4fb8dae33..b41768959 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,7 @@ -From b8640b0861e289e98af98a0f8b6861af6d2a2fd7 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +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: Stefan Agner Date: Sat, 30 Jul 2022 11:21:31 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: Add LED overrides @@ -64,5 +64,5 @@ index fa2b96e31a4f..f7fdf8bbb395 100644 eth_led1 = <&phy1>,"led-modes:4"; -- -2.39.1 +2.42.0 diff --git a/buildroot-external/board/raspberrypi/yellow/patches/linux/0014-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 similarity index 81% rename from buildroot-external/board/raspberrypi/yellow/patches/linux/0014-ARM-dts-bcm2711-yellow-use-serial-alias-to-enumerate.patch rename to buildroot-external/board/raspberrypi/yellow/patches/linux/0013-ARM-dts-bcm2711-yellow-use-serial-alias-to-enumerate.patch index 6a414340f..a05edb374 100644 --- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0014-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,7 @@ -From 60e2cd5b6747992f47feef0ee36e2d0d80706c18 Mon Sep 17 00:00:00 2001 -Message-Id: <60e2cd5b6747992f47feef0ee36e2d0d80706c18.1685523528.git.stefan@agner.ch> -In-Reply-To: -References: +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: Stefan Agner Date: Wed, 31 May 2023 10:57:43 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: use serial alias to enumerate @@ -42,5 +42,5 @@ index f7fdf8bbb395..b8f0bc2df062 100644 mmc1 = &mmcnr; mmc2 = &sdhost; -- -2.40.1 +2.42.0 diff --git a/buildroot-external/board/raspberrypi/yellow/patches/linux/0013-Revert-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/buildroot-external/board/raspberrypi/yellow/patches/linux/0013-Revert-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch deleted file mode 100644 index 9a6f8a9bb..000000000 --- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0013-Revert-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch +++ /dev/null @@ -1,56 +0,0 @@ -From e223dcd78da4356a2aebb2d99412229978ee4c12 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: -From: Phil Elwell -Date: Thu, 23 Feb 2023 09:34:12 +0000 -Subject: [PATCH] Revert "amba_pl011: Don't use DT aliases for numbering" - -This reverts commit c2fa32a8dae4c4b2638c9f4de5e398e98460e693. - -Consistent, logical UART numbering is desirable, so remove the -effective revert. - -See: https://forums.raspberrypi.com/viewtopic.php?t=347868 - -Signed-off-by: Phil Elwell ---- - drivers/tty/serial/amba-pl011.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 6f92f581e18c..d301253e26b1 100644 ---- a/drivers/tty/serial/amba-pl011.c -+++ b/drivers/tty/serial/amba-pl011.c -@@ -2671,7 +2671,6 @@ static struct uart_driver amba_reg = { - .cons = AMBA_CONSOLE, - }; - --#if 0 - static int pl011_probe_dt_alias(int index, struct device *dev) - { - struct device_node *np; -@@ -2703,7 +2702,6 @@ static int pl011_probe_dt_alias(int index, struct device *dev) - - return ret; - } --#endif - - /* unregisters the driver also if no more ports are left */ - static void pl011_unregister_port(struct uart_amba_port *uap) -@@ -2755,12 +2753,7 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, - if (IS_ERR(base)) - return PTR_ERR(base); - -- /* Don't use DT serial aliases - it causes the device to -- be renumbered to ttyAMA1 if it is the second serial port in the -- system, even though the other one is ttyS0. The 8250 driver -- doesn't use this logic, so always remains ttyS0. - index = pl011_probe_dt_alias(index, dev); -- */ - - uap->port.dev = dev; - uap->port.mapbase = mmiobase->start; --- -2.40.1 - diff --git a/buildroot-external/board/raspberrypi/yellow/patches/linux/0015-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 similarity index 86% rename from buildroot-external/board/raspberrypi/yellow/patches/linux/0015-ARM-dts-bcm2711-yellow-Use-mini-UART-for-Bluetooth-b.patch rename to buildroot-external/board/raspberrypi/yellow/patches/linux/0014-ARM-dts-bcm2711-yellow-Use-mini-UART-for-Bluetooth-b.patch index 56b137349..29823b055 100644 --- a/buildroot-external/board/raspberrypi/yellow/patches/linux/0015-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,7 +1,7 @@ -From 51e62f1491c1fce95541008d29d154e4ae117a22 Mon Sep 17 00:00:00 2001 -Message-Id: <51e62f1491c1fce95541008d29d154e4ae117a22.1685609747.git.stefan@agner.ch> -In-Reply-To: -References: +From a26f2b40904ce7b6ac96de951fdf40035877fce4 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: Stefan Agner Date: Thu, 1 Jun 2023 10:22:12 +0200 Subject: [PATCH] ARM: dts: bcm2711: yellow: Use mini-UART for Bluetooth by @@ -75,5 +75,5 @@ index b8f0bc2df062..78e61e628d66 100644 brcm,pins = <0 1>; brcm,function = ; -- -2.40.1 +2.42.0 diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index d3443cbe0..17489c923 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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/1.20230405.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231024.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 657712e55..1102a5515 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231024.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 9cee9c4c0..a1ac3c333 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(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/1.20230405.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231024.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index d167858e0..4e869f64f 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231024.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index 39e099cc5..9f9901cd5 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4 $(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/1.20230405.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231024.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index f8068d93f..046ad1030 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20230405.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20231024.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y