From 9cd3119169b21f8c08dc50f36b133400d919ebff Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Fri, 24 May 2024 17:30:03 +0800
Subject: [PATCH] arm64: dts: rockchip: Move rk3576.dtsi out of
 rk3576-evb1.dtsi

Allow the final dts to modify the contents of rk3576.dtsi,
e.g. including rk3576-cpu-swap.dtsi.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I981c1bd2541c6bb3a5fc7c1ff8126f358f85beee
---
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-android9.dts        | 1 +
 .../arm64/boot/dts/rockchip/rk3576-evb1-v10-edp-NV140QUM-N61.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-hdmi2dp.dts         | 1 +
 .../boot/dts/rockchip/rk3576-evb1-v10-image-reverse-demo.dts     | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-ipc-4x-linux.dts    | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux-amp.dts       | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-lontium-hdmiin.dts  | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-nvp6324-ahd2csi.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-rk628-hdmi2csi.dts  | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-tp2815-ahd2csi.dts  | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts                 | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1.dtsi                    | 1 -
 13 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-android9.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-android9.dts
index 305350c1e0e9..919e55b52ea3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-android9.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-android9.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-evb1-cam-dcphy0.dtsi"
 #include "rk3576-android9.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-edp-NV140QUM-N61.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-edp-NV140QUM-N61.dts
index f74d9014e975..013459c64ec3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-edp-NV140QUM-N61.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-edp-NV140QUM-N61.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-evb1-cam-dcphy0.dtsi"
 #include "rk3576-android.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-hdmi2dp.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-hdmi2dp.dts
index c1dcef1d55ee..a51d5f119aa8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-hdmi2dp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-hdmi2dp.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-evb1-cam-dcphy0.dtsi"
 #include "rk3576-android.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-image-reverse-demo.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-image-reverse-demo.dts
index 0e49c52ba6e1..601dc4e5a306 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-image-reverse-demo.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-image-reverse-demo.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-android.dtsi"
 #include "rk3576-evb1-v10-image-reverse-vehicle.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-ipc-4x-linux.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-ipc-4x-linux.dts
index 6139cf57ffa3..c98b29af8ead 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-ipc-4x-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-ipc-4x-linux.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-evb1-cam-4x.dtsi"
 #include "rk3576-linux.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux-amp.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux-amp.dts
index e853d9be5c1d..39a026808199 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux-amp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux-amp.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-evb1-cam-dcphy0.dtsi"
 #include "rk3576-linux.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux.dts
index ca1810279f66..bdc971231844 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-linux.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-evb1-cam-dcphy0.dtsi"
 #include "rk3576-linux.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-lontium-hdmiin.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-lontium-hdmiin.dts
index 53ddcb2df254..3534c6c4b9ce 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-lontium-hdmiin.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-lontium-hdmiin.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-android.dtsi"
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-nvp6324-ahd2csi.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-nvp6324-ahd2csi.dts
index e82117494f48..336ad74fa77a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-nvp6324-ahd2csi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-nvp6324-ahd2csi.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-android.dtsi"
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-rk628-hdmi2csi.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-rk628-hdmi2csi.dts
index 87d0adf7ab70..758c19b1e832 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-rk628-hdmi2csi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-rk628-hdmi2csi.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-android.dtsi"
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-tp2815-ahd2csi.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-tp2815-ahd2csi.dts
index 8e03e293450a..6b46497f0147 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-tp2815-ahd2csi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-tp2815-ahd2csi.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-android.dtsi"
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts
index f8619b427c14..c731710390c1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb1.dtsi"
 #include "rk3576-evb1-cam-dcphy0.dtsi"
 #include "rk3576-android.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-evb1.dtsi
index 323e628adf7d..ecada76dd8d6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1.dtsi
@@ -5,7 +5,6 @@
  */
 
 #include <dt-bindings/usb/pd.h>
-#include "rk3576.dtsi"
 #include "rk3576-evb.dtsi"
 #include "rk3576-rk806.dtsi"