diff --git a/Documentation/kernel.md b/Documentation/kernel.md index da3ef3a0c..b97125d7f 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -11,6 +11,7 @@ Default Kernel tree: 5.15 | Raspberry Pi 2 | 5.15.32 | | Raspberry Pi 3 | 5.15.32 | | Raspberry Pi 4 | 5.15.32 | +| Home Assistant Yellow | 5.15.32 | | Tinker Board | 5.15.32 | | Odroid-C2 | 5.15.32 | | Odroid-C4 | 5.15.32 | 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 e8745cf85..bef858632 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,7 +1,7 @@ -From 017d6caf5d4e0b0963109633e191f49d7814165e Mon Sep 17 00:00:00 2001 -Message-Id: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From 2d3d8c091bc692999a1c519c1dc1570cc8be2358 Mon Sep 17 00:00:00 2001 +Message-Id: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> From: Stefan Agner -Date: Wed, 3 Nov 2021 00:00:45 +0100 +Date: Mon, 11 Apr 2022 14:47:59 +0200 Subject: [PATCH 1/9] ARM: dts: bcm2711: Add device tree for Home Assistant Yellow @@ -11,15 +11,15 @@ board. Signed-off-by: Stefan Agner --- arch/arm/boot/dts/Makefile | 3 +- - .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 659 ++++++++++++++++++ + .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 598 ++++++++++++++++++ arch/arm64/boot/dts/broadcom/Makefile | 1 + .../broadcom/bcm2711-rpi-cm4-ha-yellow.dts | 1 + - 4 files changed, 663 insertions(+), 1 deletion(-) + 4 files changed, 602 insertions(+), 1 deletion(-) 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 6bcb35ad76ac..40d9f4433cef 100644 +index f9acf5c4a59b..fb5b4555d42e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -17,7 +17,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -34,19 +34,18 @@ index 6bcb35ad76ac..40d9f4433cef 100644 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..9e7a66e70197 +index 000000000000..61d8c81d3de4 --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -@@ -0,0 +1,659 @@ +@@ -0,0 +1,598 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2711.dtsi" -+#include "bcm2835-rpi.dtsi" -+ -+#include ++#include "bcm2711-rpi.dtsi" ++//#include "bcm283x-rpi-usb-peripheral.dtsi" + +/ { -+ compatible = "raspberrypi,4-compute-module-ha-yellow", "brcm,bcm2711"; ++ compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711"; + model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow"; + + chosen { @@ -54,19 +53,6 @@ index 000000000000..9e7a66e70197 + stdout-path = "serial1:115200n8"; + }; + -+ /* Will be filled by the bootloader */ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0 0 0>; -+ }; -+ -+ aliases { -+ emmc2bus = &emmc2bus; -+ ethernet0 = &genet; -+ pcie0 = &pcie0; -+ blconfig = &blconfig; -+ }; -+ + leds { + led-act { + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; @@ -94,8 +80,8 @@ index 000000000000..9e7a66e70197 + regulator-always-on; + regulator-settling-time-us = <5000>; + gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>; -+ states = <1800000 0x1 -+ 3300000 0x0>; ++ states = <1800000 0x1>, ++ <3300000 0x0>; + status = "okay"; + }; + @@ -118,42 +104,26 @@ index 000000000000..9e7a66e70197 + status = "okay"; +}; + -+&firmware { -+ firmware_clocks: clocks { -+ compatible = "raspberrypi,firmware-clocks"; -+ #clock-cells = <1>; ++&expgpio { ++ gpio-line-names = "BT_ON", ++ "WL_ON", ++ "PWR_LED_OFF", ++ "ANT1", ++ "VDD_SD_IO_SEL", ++ "CAM_GPIO", ++ "SD_PWR_ON", ++ "ANT2"; ++ ++ ant1: ant1 { ++ gpio-hog; ++ gpios = <3 GPIO_ACTIVE_HIGH>; ++ output-high; + }; + -+ expgpio: gpio { -+ compatible = "raspberrypi,firmware-gpio"; -+ gpio-controller; -+ #gpio-cells = <2>; -+ gpio-line-names = "BT_ON", -+ "WL_ON", -+ "PWR_LED_OFF", -+ "ANT1", -+ "VDD_SD_IO_SEL", -+ "CAM_GPIO", -+ "SD_PWR_ON", -+ "ANT2"; -+ status = "okay"; -+ -+ ant1: ant1 { -+ gpio-hog; -+ gpios = <3 GPIO_ACTIVE_HIGH>; -+ output-high; -+ }; -+ -+ ant2: ant2 { -+ gpio-hog; -+ gpios = <7 GPIO_ACTIVE_HIGH>; -+ output-low; -+ }; -+ }; -+ -+ reset: reset { -+ compatible = "raspberrypi,firmware-reset"; -+ #reset-cells = <1>; ++ ant2: ant2 { ++ gpio-hog; ++ gpios = <7 GPIO_ACTIVE_HIGH>; ++ output-low; + }; +}; + @@ -231,23 +201,13 @@ index 000000000000..9e7a66e70197 +}; + +&hdmi0 { -+ clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>; -+ clock-names = "hdmi", "bvb", "audio", "cec"; -+ wifi-2.4ghz-coexistence; + status = "okay"; +}; + +&hdmi1 { -+ clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>; -+ clock-names = "hdmi", "bvb", "audio", "cec"; -+ wifi-2.4ghz-coexistence; + status = "okay"; +}; + -+&hvs { -+ clocks = <&firmware_clocks 4>; -+}; -+ +&pixelvalve0 { + status = "okay"; +}; @@ -270,22 +230,6 @@ index 000000000000..9e7a66e70197 + status = "okay"; +}; + -+&rmem { -+ /* -+ * RPi4's co-processor will copy the board's bootloader configuration -+ * into memory for the OS to consume. It'll also update this node with -+ * its placement information. -+ */ -+ blconfig: nvram@0 { -+ compatible = "raspberrypi,bootloader-config", "nvmem-rmem"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ reg = <0x0 0x0 0x0>; -+ no-map; -+ status = "disabled"; -+ }; -+}; -+ +/* SDHCI is used to control the SDIO for wireless */ +&sdhci { + #address-cells = <1>; @@ -327,17 +271,12 @@ index 000000000000..9e7a66e70197 + +&pcie0 { + pci@0,0 { -+ device_type = "pci"; ++ device-type = "pci"; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + reg = <0 0 0 0 0>; -+ -+ usb@0,0 { -+ reg = <0 0 0 0 0>; -+ resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>; -+ }; + }; +}; + @@ -389,7 +328,7 @@ index 000000000000..9e7a66e70197 + }; +}; + -+#include "bcm2711-rpi.dtsi" ++#include "bcm2711-rpi-ds.dtsi" +#include "bcm283x-rpi-csi0-2lane.dtsi" +#include "bcm283x-rpi-csi1-4lane.dtsi" +#include "bcm283x-rpi-i2c0mux_0_44.dtsi" @@ -698,17 +637,17 @@ index 000000000000..9e7a66e70197 + }; +}; diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index e7c2c4fd59a8..6fa5993dd993 100644 +index 8eadc747ae1f..786dfe43d804 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile -@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb +@@ -13,6 +13,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-yellow.dtb + subdir-y += bcm4908 subdir-y += northstar2 - subdir-y += stingray 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 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 94e126c1c..e02b34680 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 f2a63a3b9c1b18a5917973fc57be353118905a66 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From a4a63bb6f6789c00762b92f0469d10bac525d1f9 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 4 Mar 2021 14:33:09 +0100 Subject: [PATCH 2/9] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio @@ -11,22 +11,25 @@ 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 | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) + arch/arm/boot/dts/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 9e7a66e70197..8aee09ac48d7 100644 +index 61d8c81d3de4..8db71876a78c 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 { - }; +@@ -8,6 +8,10 @@ / { + compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711"; + model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow"; - aliases { ++ aliases { + serial4 = &uart4; - emmc2bus = &emmc2bus; - ethernet0 = &genet; - pcie0 = &pcie0; -@@ -322,6 +323,14 @@ &uart1 { ++ }; ++ + chosen { + /* 8250 auxiliary UART instead of pl011 */ + stdout-path = "serial1:115200n8"; +@@ -261,6 +265,14 @@ &uart1 { status = "okay"; }; @@ -41,7 +44,7 @@ index 9e7a66e70197..8aee09ac48d7 100644 &vchiq { interrupts = ; }; -@@ -549,9 +558,9 @@ uart3_pins: uart3_pins { +@@ -488,9 +500,9 @@ uart3_pins: uart3_pins { }; uart4_pins: uart4_pins { 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 009f4c400..5e0efd638 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 7eb79cbd146225ecf2b205d5b5eef16f87a2aebc Mon Sep 17 00:00:00 2001 -Message-Id: <7eb79cbd146225ecf2b205d5b5eef16f87a2aebc.1648505253.git.stefan@agner.ch> -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From c0ddd45166d5aa922045da915202540db3ef2dc2 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 4 Mar 2021 14:44:23 +0100 Subject: [PATCH 3/9] ARM: dts: bcm2711: yellow: Mux debug UART5 @@ -12,18 +12,18 @@ Signed-off-by: Stefan Agner 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 8aee09ac48d7..7755b1ae48b6 100644 +index 8db71876a78c..d1dea0a214a6 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 { +@@ -10,6 +10,7 @@ / { aliases { serial4 = &uart4; + serial5 = &uart5; - emmc2bus = &emmc2bus; - ethernet0 = &genet; - pcie0 = &pcie0; -@@ -331,6 +332,13 @@ &uart4 { + }; + + chosen { +@@ -273,6 +274,13 @@ &uart4 { status = "okay"; }; @@ -37,7 +37,7 @@ index 8aee09ac48d7..7755b1ae48b6 100644 &vchiq { interrupts = ; }; -@@ -366,6 +374,7 @@ soc { +@@ -308,6 +316,7 @@ soc { / { chosen { bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=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 index 08389066b..09f91f01c 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 1efbeac97f7308aedddfbfdb3fee291b2015b585 Mon Sep 17 00:00:00 2001 -Message-Id: <1efbeac97f7308aedddfbfdb3fee291b2015b585.1648505253.git.stefan@agner.ch> -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From 606dcdc896ffc18001ad4983d45a2e23cacd040a Mon Sep 17 00:00:00 2001 +Message-Id: <606dcdc896ffc18001ad4983d45a2e23cacd040a.1649681596.git.stefan@agner.ch> +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.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 @@ -14,10 +14,10 @@ Signed-off-by: Stefan Agner 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 7755b1ae48b6..0f2e7e7dad3e 100644 +index d1dea0a214a6..0bdbfdd44aed 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 { +@@ -531,6 +531,12 @@ &i2c1 { clock-frequency = <100000>; }; 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 e78a4e010..e8cdd1818 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 7db679e610a520eb57c659a3d0366224146f16e4 Mon Sep 17 00:00:00 2001 -Message-Id: <7db679e610a520eb57c659a3d0366224146f16e4.1648505253.git.stefan@agner.ch> -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From 955e093a5ed6b27e36506df63cfb268cc82f2935 Mon Sep 17 00:00:00 2001 +Message-Id: <955e093a5ed6b27e36506df63cfb268cc82f2935.1649681596.git.stefan@agner.ch> +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 4 Mar 2021 17:19:01 +0100 Subject: [PATCH 5/9] ARM: dts: bcm2711: yellow: add I2S audio codec @@ -14,10 +14,10 @@ Signed-off-by: Stefan Agner 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 0f2e7e7dad3e..67c7d86ecca2 100644 +index 0bdbfdd44aed..f203f7037915 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 { +@@ -535,11 +535,22 @@ &i2c6 { pinctrl-names = "default"; pinctrl-0 = <&i2c6_pins>; status = "okay"; @@ -40,7 +40,7 @@ index 0f2e7e7dad3e..67c7d86ecca2 100644 }; // ============================================= -@@ -640,6 +651,21 @@ &pwm1 { +@@ -582,6 +593,21 @@ &pwm1 { status = "disabled"; }; 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 98da5ae93..73da58574 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,30 +1,31 @@ -From cc494d2e43c40c2673abc8a4fd6599ec1796eafb Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From 7cccc3ff3a11bbf572e35678cf1cb8ed03c1fbc9 Mon Sep 17 00:00:00 2001 +Message-Id: <7cccc3ff3a11bbf572e35678cf1cb8ed03c1fbc9.1649681596.git.stefan@agner.ch> +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> From: Stefan Agner Date: Tue, 9 Mar 2021 15:02:53 +0100 Subject: [PATCH 6/9] ARM: dts: bcm2711: yellow: enable GPIO keys Signed-off-by: Stefan Agner --- - .../boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 30 +++++++++++++++++++ - 1 file changed, 30 insertions(+) + .../boot/dts/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 67c7d86ecca2..5dc5f0c81e62 100644 +index f203f7037915..c74193b3987e 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" - #include "bcm2835-rpi.dtsi" +@@ -4,6 +4,8 @@ + #include "bcm2711-rpi.dtsi" + //#include "bcm283x-rpi-usb-peripheral.dtsi" + +#include - - #include - -@@ -29,6 +30,29 @@ aliases { - blconfig = &blconfig; ++ + / { + compatible = "raspberrypi,4-compute-module-ha-yellow", "raspberrypi,4-compute-module", "brcm,bcm2711"; + model = "Raspberry Pi Compute Module 4 on Home Assistant Yellow"; +@@ -18,6 +20,29 @@ chosen { + stdout-path = "serial1:115200n8"; }; + keys: gpio-keys { @@ -53,7 +54,7 @@ index 67c7d86ecca2..5dc5f0c81e62 100644 leds { led-act { gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; -@@ -438,6 +462,12 @@ spidev1: spidev@1{ +@@ -380,6 +405,12 @@ spidev1: spidev@1{ }; &gpio { 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 e95d49662..5f1ffea63 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 3e3fca9f4dd8e91d929893664213b6dcc571dc16 Mon Sep 17 00:00:00 2001 -Message-Id: <3e3fca9f4dd8e91d929893664213b6dcc571dc16.1648505253.git.stefan@agner.ch> -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From c6861d55c71dfd6fb428e9e8b4246e78d526df82 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.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 @@ -14,18 +14,18 @@ Signed-off-by: Stefan Agner 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 5dc5f0c81e62..1a1ebdd54b39 100644 +index c74193b3987e..f5d1d8b9ea32 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -@@ -393,7 +393,6 @@ soc { - #include "bcm2711-rpi.dtsi" +@@ -336,7 +336,6 @@ soc { + #include "bcm2711-rpi-ds.dtsi" #include "bcm283x-rpi-csi0-2lane.dtsi" #include "bcm283x-rpi-csi1-4lane.dtsi" -#include "bcm283x-rpi-i2c0mux_0_44.dtsi" / { chosen { -@@ -675,6 +674,12 @@ pwr_led: led-pwr { +@@ -618,6 +617,12 @@ pwr_led: led-pwr { linux,default-trigger = "default-on"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; }; 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 1f9d8f7f4..ce8d9903c 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 2aaa4d5dd580848cb73881182903868c6aa7e35c Mon Sep 17 00:00:00 2001 -Message-Id: <2aaa4d5dd580848cb73881182903868c6aa7e35c.1648505253.git.stefan@agner.ch> -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From 57289aaeb0a0a3b09991d005d6e3317ed2da6b7a Mon Sep 17 00:00:00 2001 +Message-Id: <57289aaeb0a0a3b09991d005d6e3317ed2da6b7a.1649681596.git.stefan@agner.ch> +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.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 @@ -12,10 +12,10 @@ Signed-off-by: Stefan Agner 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 1a1ebdd54b39..d33be3e96b8a 100644 +index f5d1d8b9ea32..5c682d09616a 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -@@ -632,6 +632,11 @@ card_codec: pcm5121@4c { +@@ -575,6 +575,11 @@ card_codec: pcm5121@4c { CPVDD-supply = <&vdd_3v3_reg>; status = "okay"; }; 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 95ac18b1c..785e00fa3 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 c65c727a631864a9ea486f41437f3392cbb1885e Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> -References: <017d6caf5d4e0b0963109633e191f49d7814165e.1648505253.git.stefan@agner.ch> +From 7211af3546200c906b719c3e664d2554d48a43f5 Mon Sep 17 00:00:00 2001 +Message-Id: <7211af3546200c906b719c3e664d2554d48a43f5.1649681596.git.stefan@agner.ch> +In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.git.stefan@agner.ch> +References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1649681596.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 @@ -16,10 +16,10 @@ Signed-off-by: Stefan Agner 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 d33be3e96b8a..d81f2f1d4b43 100644 +index 5c682d09616a..b988d50234c1 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts -@@ -656,6 +656,15 @@ &sdhost { +@@ -599,6 +599,15 @@ &sdhost { status = "disabled"; }; diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index e66b48550..97a7ebb8e 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -23,7 +23,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.20220308.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.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 @@ -111,7 +111,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u 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/yellow/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y