From 6cab55bf610bfa004ccab9386df3e850fe581a49 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Jun 2022 13:47:22 +0100 Subject: [PATCH] ARM64: dts: Add Zero 2 W and CM4S Zero 2 W and CM4S are 64-bit-capable, so their DTBs should be buildable in the arm64 tree. See (misplaced) comment in https://github.com/raspberrypi/linux/issues/4857 Signed-off-by: Phil Elwell --- arch/arm64/boot/dts/broadcom/Makefile | 2 ++ arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts | 1 + arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts | 2 +- arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile index e7c2c4fd59a8..7fe8ece41072 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \ bcm2837-rpi-3-b-plus.dtb \ bcm2837-rpi-cm3-io3.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-zero-2.dtb +dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-zero-2-w.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb @@ -11,6 +12,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-cm4s.dtb subdir-y += northstar2 subdir-y += stingray diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts new file mode 100644 index 000000000000..4d34e0afd4cd --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2710-rpi-zero-2-w.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts index f76f553599ef..4d34e0afd4cd 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts @@ -1 +1 @@ -#include "../../../../arm/boot/dts/bcm2710-rpi-zero-2.dts" +#include "../../../../arm/boot/dts/bcm2710-rpi-zero-2-w.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts new file mode 100644 index 000000000000..28e0980a374b --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2711-rpi-cm4s.dts"