From 817483ec0cec5235843849f4448ceadc44d87ff7 Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Fri, 24 May 2024 17:30:04 +0800
Subject: [PATCH] arm64: dts: rockchip: Move rk3576.dtsi out of
 rk3576-test2.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: I2740041f036a58b2e8a44acc2d536226c6ba782a
---
 arch/arm64/boot/dts/rockchip/rk3576-test2-v10-linux.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-test2-v10.dts       | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi          | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test2-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3576-test2-v10-linux.dts
index 16dd51cfaf15..52dd3d2a1ece 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-test2-v10-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-test2-v10-linux.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-test2.dtsi"
 #include "rk3576-linux.dtsi"
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test2-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-test2-v10.dts
index dd70037c64ad..10b438f95a7d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-test2-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-test2-v10.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-test2.dtsi"
 #include "rk3576-android.dtsi"
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi
index 53399ac9cc34..cc4e5984cca1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576-test2.dtsi
@@ -4,7 +4,6 @@
  *
  */
 
-#include "rk3576.dtsi"
 #include "rk3576-evb.dtsi"
 #include "rk3576-rk806.dtsi"