diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json index 3faa087c0..1c816041f 100644 --- a/.github/workflows/matrix.json +++ b/.github/workflows/matrix.json @@ -71,6 +71,12 @@ "runner": "aarch64-runner", "label": "board/raspberrypi" }, + { + "id": "yellow", + "defconfig": "yellow", + "runner": "aarch64-runner", + "label": "board/yellow" + }, { "id": "tinker", "defconfig": "tinker", diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0004-ARM-dts-bcm2711-amber-Enable-I2C6-by-default.patch b/buildroot-external/board/raspberrypi/amber/patches/linux/0004-ARM-dts-bcm2711-amber-Enable-I2C6-by-default.patch deleted file mode 100644 index 23d049042..000000000 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0004-ARM-dts-bcm2711-amber-Enable-I2C6-by-default.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 494a018160133dc908c7ceb42daa016d147e488c Mon Sep 17 00:00:00 2001 -Message-Id: <494a018160133dc908c7ceb42daa016d147e488c.1636734839.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Thu, 4 Mar 2021 14:48:48 +0100 -Subject: [PATCH 4/8] ARM: dts: bcm2711: amber: Enable I2C6 by default - -The main I2C bus used on Amber is I2C6. Enable it by default. - -Signed-off-by: Stefan Agner ---- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -index 4c2fe964eb72..a95c3f96044a 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -@@ -589,6 +589,12 @@ &i2c1 { - clock-frequency = <100000>; - }; - -+&i2c6 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c6_pins>; -+ status = "okay"; -+}; -+ - &i2s { - pinctrl-names = "default"; - pinctrl-0 = <&i2s_pins>; --- -2.33.1 - diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0007-ARM-dts-bcm2711-amber-add-user-LED.patch b/buildroot-external/board/raspberrypi/amber/patches/linux/0007-ARM-dts-bcm2711-amber-add-user-LED.patch deleted file mode 100644 index e8a88fb87..000000000 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0007-ARM-dts-bcm2711-amber-add-user-LED.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 702c3ef370741afce83cfb9a2fb166da0a94fdc7 Mon Sep 17 00:00:00 2001 -Message-Id: <702c3ef370741afce83cfb9a2fb166da0a94fdc7.1636734839.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Thu, 28 Oct 2021 19:38:04 +0200 -Subject: [PATCH 7/8] ARM: dts: bcm2711: amber: add user LED - -Add yellow user LED. - -Signed-off-by: Stefan Agner ---- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -index a2cbb8510491..3b69185ef840 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -@@ -675,6 +675,12 @@ pwr_led: led-pwr { - linux,default-trigger = "default-on"; - gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; - }; -+ -+ user_led: led-user { -+ label = "led2"; -+ linux,default-trigger = "heartbeat"; -+ gpios = <&gpio 44 GPIO_ACTIVE_LOW>; -+ }; - }; - - &pwm1 { --- -2.33.1 - diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0008-ARM-dts-bcm2711-amber-Add-NXP-PCF85063A-RTC.patch b/buildroot-external/board/raspberrypi/amber/patches/linux/0008-ARM-dts-bcm2711-amber-Add-NXP-PCF85063A-RTC.patch deleted file mode 100644 index d3aa71974..000000000 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0008-ARM-dts-bcm2711-amber-Add-NXP-PCF85063A-RTC.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1cb48f353aab457185274b734063fbdd2fc0f3df Mon Sep 17 00:00:00 2001 -Message-Id: <1cb48f353aab457185274b734063fbdd2fc0f3df.1636734839.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Fri, 12 Nov 2021 17:33:32 +0100 -Subject: [PATCH 8/8] ARM: dts: bcm2711: amber: Add NXP PCF85063A RTC - -Signed-off-by: Stefan Agner ---- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -index 3b69185ef840..01d98b05517f 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -@@ -633,6 +633,11 @@ card_codec: pcm5121@4c { - CPVDD-supply = <&vdd_3v3_reg>; - status = "okay"; - }; -+ -+ pcf85063a: rtc@51 { -+ compatible = "nxp,pcf85063a"; -+ reg = <0x51>; -+ }; - }; - - &i2s { --- -2.33.1 - diff --git a/buildroot-external/board/raspberrypi/amber/cmdline.txt b/buildroot-external/board/raspberrypi/yellow/cmdline.txt similarity index 100% rename from buildroot-external/board/raspberrypi/amber/cmdline.txt rename to buildroot-external/board/raspberrypi/yellow/cmdline.txt diff --git a/buildroot-external/board/raspberrypi/amber/config.txt b/buildroot-external/board/raspberrypi/yellow/config.txt similarity index 96% rename from buildroot-external/board/raspberrypi/amber/config.txt rename to buildroot-external/board/raspberrypi/yellow/config.txt index 9ba9349db..ff6a4374f 100644 --- a/buildroot-external/board/raspberrypi/amber/config.txt +++ b/buildroot-external/board/raspberrypi/yellow/config.txt @@ -72,6 +72,5 @@ dtparam=audio=on [all] #dtoverlay=vc4-fkms-v3d #max_framebuffers=2 -device_tree=bcm2711-rpi-cm4-ha-amber.dtb -dtoverlay=dwc2,dr_mode=host +device_tree=bcm2711-rpi-cm4-ha-yellow.dtb diff --git a/buildroot-external/board/raspberrypi/amber/meta b/buildroot-external/board/raspberrypi/yellow/meta similarity index 81% rename from buildroot-external/board/raspberrypi/amber/meta rename to buildroot-external/board/raspberrypi/yellow/meta index 44398ad85..00440f842 100644 --- a/buildroot-external/board/raspberrypi/amber/meta +++ b/buildroot-external/board/raspberrypi/yellow/meta @@ -1,5 +1,5 @@ -BOARD_ID=amber -BOARD_NAME="Amber" +BOARD_ID=yellow +BOARD_NAME="Yellow" CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=Image diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-A.patch b/buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch similarity index 91% rename from buildroot-external/board/raspberrypi/amber/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-A.patch rename to buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch index b7eed06bd..96e97a4c0 100644 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-A.patch +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch @@ -1,25 +1,25 @@ -From a08d21ffe9957db5f00b1ee8f0d1667b11a25cb9 Mon Sep 17 00:00:00 2001 -Message-Id: +From 9d68dedb813f942286856c9d8c2eed01b55bb473 Mon Sep 17 00:00:00 2001 +Message-Id: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> From: Stefan Agner Date: Wed, 3 Nov 2021 00:00:45 +0100 -Subject: [PATCH 1/8] ARM: dts: bcm2711: Add device tree for Home Assistant - Amber +Subject: [PATCH 1/9] ARM: dts: bcm2711: Add device tree for Home Assistant + Yellow -Add device tree for Home Assistant Amber, a Compute Module 4 based I/O +Add device tree for Home Assistant Yellow, a Compute Module 4 based I/O board. Signed-off-by: Stefan Agner --- arch/arm/boot/dts/Makefile | 3 +- - .../arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 659 ++++++++++++++++++ + .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 659 ++++++++++++++++++ arch/arm64/boot/dts/broadcom/Makefile | 1 + - .../dts/broadcom/bcm2711-rpi-cm4-ha-amber.dts | 1 + + .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 1 + 4 files changed, 663 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts - create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-amber.dts + 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 12cd8bf582e1..4fa8c7be516a 100644 +index 12cd8bf582e1..de739b68635b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -14,7 +14,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -28,15 +28,15 @@ index 12cd8bf582e1..4fa8c7be516a 100644 bcm2710-rpi-cm3.dtb \ - bcm2711-rpi-cm4.dtb + bcm2711-rpi-cm4.dtb \ -+ bcm2711-rpi-cm4-ha-amber.dtb ++ bcm2711-rpi-cm4-ha-yellow.dtb dtb-$(CONFIG_ARCH_ALPINE) += \ alpine-db.dtb -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts +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..855da2b029a4 +index 000000000000..5d4e058cac43 --- /dev/null -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts @@ -0,0 +1,659 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; @@ -46,8 +46,8 @@ index 000000000000..855da2b029a4 +#include + +/ { -+ compatible = "raspberrypi,4-compute-module-ha-amber", "brcm,bcm2711"; -+ model = "Raspberry Pi Compute Module 4 on Home Assistant Amber"; ++ compatible = "raspberrypi,4-compute-module-ha-yellow", "brcm,bcm2711"; ++ model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow"; + + chosen { + /* 8250 auxiliary UART instead of pl011 */ @@ -698,24 +698,24 @@ index 000000000000..855da2b029a4 + }; +}; diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index 69809bf2f45d..aef509d06d14 100644 +index 69809bf2f45d..22327ed93238 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.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-amber.dtb ++dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4-ha-yellow.dtb subdir-y += northstar2 subdir-y += stingray -diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-amber.dts +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..728975338bf0 +index 000000000000..fdc5ec5bc956 --- /dev/null -+++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-amber.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts @@ -0,0 +1 @@ -+#include "../../../../arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts" ++#include "../../../../arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts" -- -2.33.1 +2.34.1 diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0002-ARM-dts-bcm2711-amber-Mux-UART4-for-SiLabs-radio-mod.patch b/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch similarity index 58% rename from buildroot-external/board/raspberrypi/amber/patches/linux/0002-ARM-dts-bcm2711-amber-Mux-UART4-for-SiLabs-radio-mod.patch rename to buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch index 0ed11c693..430c9502a 100644 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0002-ARM-dts-bcm2711-amber-Mux-UART4-for-SiLabs-radio-mod.patch +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch @@ -1,23 +1,23 @@ -From c2cd4c6be5337c1998e789f5eab755c8a71030d9 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From e2b56e7d8786f7000c3159346b6cf2360ad3c8c3 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 4 Mar 2021 14:33:09 +0100 -Subject: [PATCH 2/8] ARM: dts: bcm2711: amber: Mux UART4 for SiLabs radio +Subject: [PATCH 2/9] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio module Enable UART4 by default and mux pins including hardware flow control. Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 13 +++++++++++-- + arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -index 855da2b029a4..ba4116cdffc4 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts +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 5d4e058cac43..6b702d66ac55 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts @@ -21,6 +21,7 @@ memory@0 { }; @@ -54,5 +54,5 @@ index 855da2b029a4..ba4116cdffc4 100644 uart5_pins: uart5_pins { -- -2.33.1 +2.34.1 diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0003-ARM-dts-bcm2711-amber-Mux-debug-UART5.patch b/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch similarity index 54% rename from buildroot-external/board/raspberrypi/amber/patches/linux/0003-ARM-dts-bcm2711-amber-Mux-debug-UART5.patch rename to buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch index 97a46f358..0edd6a8da 100644 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0003-ARM-dts-bcm2711-amber-Mux-debug-UART5.patch +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch @@ -1,20 +1,20 @@ -From 34ad3ae858d00c68703bea3b94dfb59c8bb928d9 Mon Sep 17 00:00:00 2001 -Message-Id: <34ad3ae858d00c68703bea3b94dfb59c8bb928d9.1636734839.git.stefan@agner.ch> -In-Reply-To: -References: +From 6b48f11add95190d8148a4a4689b35f41b5167bb Mon Sep 17 00:00:00 2001 +Message-Id: <6b48f11add95190d8148a4a4689b35f41b5167bb.1641573384.git.stefan@agner.ch> +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 4 Mar 2021 14:44:23 +0100 -Subject: [PATCH 3/8] ARM: dts: bcm2711: amber: Mux debug UART5 +Subject: [PATCH 3/9] ARM: dts: bcm2711: yellow: Mux debug UART5 Signed-off-by: Stefan Agner --- - arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 9 +++++++++ + arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -index ba4116cdffc4..4c2fe964eb72 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts +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 6b702d66ac55..3f611d90093d 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts @@ -22,6 +22,7 @@ memory@0 { aliases { @@ -46,5 +46,5 @@ index ba4116cdffc4..4c2fe964eb72 100644 aliases { -- -2.33.1 +2.34.1 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 new file mode 100644 index 000000000..334d0bb3d --- /dev/null +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch @@ -0,0 +1,35 @@ +From 60ea1895f939eec8bd8615325af3aa7b70827c2e Mon Sep 17 00:00:00 2001 +Message-Id: <60ea1895f939eec8bd8615325af3aa7b70827c2e.1641573384.git.stefan@agner.ch> +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +From: Stefan Agner +Date: Thu, 4 Mar 2021 14:48:48 +0100 +Subject: [PATCH 4/9] ARM: dts: bcm2711: yellow: Enable I2C6 by default + +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 ++++++ + 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 3f611d90093d..822644185466 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +@@ -589,6 +589,12 @@ &i2c1 { + clock-frequency = <100000>; + }; + ++&i2c6 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c6_pins>; ++ status = "okay"; ++}; ++ + &i2s { + pinctrl-names = "default"; + pinctrl-0 = <&i2s_pins>; +-- +2.34.1 + diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0005-ARM-dts-bcm2711-amber-add-I2S-audio-codec.patch b/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch similarity index 62% rename from buildroot-external/board/raspberrypi/amber/patches/linux/0005-ARM-dts-bcm2711-amber-add-I2S-audio-codec.patch rename to buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch index e01277368..161f59037 100644 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0005-ARM-dts-bcm2711-amber-add-I2S-audio-codec.patch +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch @@ -1,22 +1,22 @@ -From 4311662759cc1a652859d61b62e2bf1e388a3bee Mon Sep 17 00:00:00 2001 -Message-Id: <4311662759cc1a652859d61b62e2bf1e388a3bee.1636734839.git.stefan@agner.ch> -In-Reply-To: -References: +From 7b33c54f4b768175ccddf746a828bf462a67494b Mon Sep 17 00:00:00 2001 +Message-Id: <7b33c54f4b768175ccddf746a828bf462a67494b.1641573384.git.stefan@agner.ch> +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 4 Mar 2021 17:19:01 +0100 -Subject: [PATCH 5/8] ARM: dts: bcm2711: amber: add I2S audio codec +Subject: [PATCH 5/9] ARM: dts: bcm2711: yellow: add I2S audio codec Add TI PCM5122 I2S audio codec. Signed-off-by: Stefan Agner --- - .../arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 26 +++++++++++++++++++ + .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -index a95c3f96044a..637ce01618d8 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts +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 822644185466..f3967b67368a 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts @@ -593,11 +593,22 @@ &i2c6 { pinctrl-names = "default"; pinctrl-0 = <&i2c6_pins>; @@ -63,5 +63,5 @@ index a95c3f96044a..637ce01618d8 100644 pinctrl-names = "default"; pinctrl-0 = <&audio_pins>; -- -2.33.1 +2.34.1 diff --git a/buildroot-external/board/raspberrypi/amber/patches/linux/0006-ARM-dts-bcm2711-amber-enable-GPIO-keys.patch b/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch similarity index 65% rename from buildroot-external/board/raspberrypi/amber/patches/linux/0006-ARM-dts-bcm2711-amber-enable-GPIO-keys.patch rename to buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch index 82cf0375f..77b9ddb2e 100644 --- a/buildroot-external/board/raspberrypi/amber/patches/linux/0006-ARM-dts-bcm2711-amber-enable-GPIO-keys.patch +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch @@ -1,20 +1,20 @@ -From a5961a4bdb240848bcce5129a587fde6ce1fce9a Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 8571b271c3e0b861cf666b2588eed380c0b79791 Mon Sep 17 00:00:00 2001 +Message-Id: <8571b271c3e0b861cf666b2588eed380c0b79791.1641573384.git.stefan@agner.ch> +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> From: Stefan Agner Date: Tue, 9 Mar 2021 15:02:53 +0100 -Subject: [PATCH 6/8] ARM: dts: bcm2711: amber: enable GPIO keys +Subject: [PATCH 6/9] ARM: dts: bcm2711: yellow: enable GPIO keys Signed-off-by: Stefan Agner --- - .../arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 30 +++++++++++++++++++ + .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -index 637ce01618d8..a2cbb8510491 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts +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 f3967b67368a..6a0c89d1f4c8 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts @@ -2,6 +2,7 @@ /dts-v1/; #include "bcm2711.dtsi" @@ -67,5 +67,5 @@ index 637ce01618d8..a2cbb8510491 100644 brcm,pins = <9 10 11>; brcm,function = ; -- -2.33.1 +2.34.1 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 new file mode 100644 index 000000000..428d26c1f --- /dev/null +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch @@ -0,0 +1,35 @@ +From 5cebd1b1689f9b4c60ae53340fe3cbf96244f51b Mon Sep 17 00:00:00 2001 +Message-Id: <5cebd1b1689f9b4c60ae53340fe3cbf96244f51b.1641573384.git.stefan@agner.ch> +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +From: Stefan Agner +Date: Thu, 28 Oct 2021 19:38:04 +0200 +Subject: [PATCH 7/9] ARM: dts: bcm2711: yellow: add user LED + +Add yellow user LED. + +Signed-off-by: Stefan Agner +--- + arch/arm/boot/dts/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 6a0c89d1f4c8..1ab98c499ba7 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +@@ -675,6 +675,12 @@ pwr_led: led-pwr { + linux,default-trigger = "default-on"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + }; ++ ++ user_led: led-user { ++ label = "led2"; ++ linux,default-trigger = "heartbeat"; ++ gpios = <&gpio 44 GPIO_ACTIVE_LOW>; ++ }; + }; + + &pwm1 { +-- +2.34.1 + 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 new file mode 100644 index 000000000..05031d6a0 --- /dev/null +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch @@ -0,0 +1,32 @@ +From bee908533513bacf315aac99b084bccde05ab251 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +From: Stefan Agner +Date: Fri, 12 Nov 2021 17:33:32 +0100 +Subject: [PATCH 8/9] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC + +Signed-off-by: Stefan Agner +--- + arch/arm/boot/dts/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 1ab98c499ba7..999a71f31d89 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +@@ -633,6 +633,11 @@ card_codec: pcm5121@4c { + CPVDD-supply = <&vdd_3v3_reg>; + status = "okay"; + }; ++ ++ pcf85063a: rtc@51 { ++ compatible = "nxp,pcf85063a"; ++ reg = <0x51>; ++ }; + }; + + &i2s { +-- +2.34.1 + 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 new file mode 100644 index 000000000..a73ba9300 --- /dev/null +++ b/buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch @@ -0,0 +1,40 @@ +From 23b7b5424150f81c7a4d7d8310ee7692fa7b9146 Mon Sep 17 00:00:00 2001 +Message-Id: <23b7b5424150f81c7a4d7d8310ee7692fa7b9146.1641573384.git.stefan@agner.ch> +In-Reply-To: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +References: <9d68dedb813f942286856c9d8c2eed01b55bb473.1641573384.git.stefan@agner.ch> +From: Stefan Agner +Date: Fri, 7 Jan 2022 17:10:00 +0100 +Subject: [PATCH 9/9] ARM: dts: bcm2711: yellow: enable USB host mode by + default + +The DWC2 controller is disable by default. Enable it since Home +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 +++++++++ + 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 999a71f31d89..5b9bd5b9ee0a 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +@@ -362,6 +362,15 @@ &uart5 { + status = "okay"; + }; + ++&usb { ++ compatible = "brcm,bcm2835-usb"; ++ dr_mode = "host"; ++ g-np-tx-fifo-size = <32>; ++ g-rx-fifo-size = <558>; ++ g-tx-fifo-size = <512 512 512 512 512 256 256>; ++ status = "okay"; ++}; ++ + &vchiq { + interrupts = ; + }; +-- +2.34.1 + diff --git a/buildroot-external/board/raspberrypi/amber/uboot-boot64.ush b/buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush similarity index 100% rename from buildroot-external/board/raspberrypi/amber/uboot-boot64.ush rename to buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush diff --git a/buildroot-external/board/raspberrypi/amber/uboot.config b/buildroot-external/board/raspberrypi/yellow/uboot.config similarity index 100% rename from buildroot-external/board/raspberrypi/amber/uboot.config rename to buildroot-external/board/raspberrypi/yellow/uboot.config diff --git a/buildroot-external/configs/amber_defconfig b/buildroot-external/configs/yellow_defconfig similarity index 94% rename from buildroot-external/configs/amber_defconfig rename to buildroot-external/configs/yellow_defconfig index 9dbbe0c4b..206d60944 100644 --- a/buildroot-external/configs/amber_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -4,7 +4,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/amber/patches" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_GCC_VERSION_9_X=y BR2_OPTIMIZE_2=y @@ -20,7 +20,7 @@ BR2_INIT_SYSTEMD=y BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rootfs-overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/amber $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.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.20211029.tar.gz" @@ -28,7 +28,7 @@ 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 BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4-ha-amber" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4-ha-yellow" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" @@ -99,10 +99,10 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10-rc5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/amber/uboot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/uboot.config" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/amber/uboot-boot64.ush" +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/uboot-boot64.ush" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y