commit 6cab55bf610bfa004ccab9386df3e850fe581a49
author Phil Elwell <phil@raspberrypi.com> Mon Jun 13 13:47:22 2022 +0100
committer Phil Elwell <8911409+pelwell@users.noreply.github.com> Sat Aug 20 16:57:55 2022 +0100
tree 2a49f8fcebd1d281b1c5e77d3e1992cdd207b759
parent 2d80ef99861cc7134b7a3e099dc085dcc3249ad4

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 <phil@raspberrypi.com>

arch/arm64/boot/dts/broadcom/Makefile

diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index e7c2c4f..7fe8ece 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -4,6 +4,7 @@
 			      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-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

arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts

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 0000000..4d34e0a
--- /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"

arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.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 f76f553..4d34e0a 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"

arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.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 0000000..28e0980
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts
@@ -0,0 +1 @@
+#include "../../../../arm/boot/dts/bcm2711-rpi-cm4s.dts"