From e0c84bcdc69035078fb00f6cea223d2d8f756fab 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-evb2.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: I7c4e3a81c9a101b9669abe875f235351bb2e0fa5
---
 arch/arm64/boot/dts/rockchip/rk3576-evb2-v10-linux.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts       | 1 +
 arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi          | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10-linux.dts
index bc76a430a1c4..99499484f9ae 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10-linux.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb2.dtsi"
 #include "rk3576-evb2-rk628-bt1120-to-hdmi.dtsi"
 #include "rk3576-evb2-rk628-hdmi2csi.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts
index 79e3486143fe..dd2fc766f24b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include "rk3576.dtsi"
 #include "rk3576-evb2.dtsi"
 #include "rk3576-evb2-rk628-bt1120-to-hdmi.dtsi"
 #include "rk3576-evb2-rk628-hdmi2csi.dtsi"
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi
index d5663ef758ef..9c8fab4e69a5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi
@@ -5,7 +5,6 @@
  */
 
 #include <dt-bindings/usb/pd.h>
-#include "rk3576.dtsi"
 #include "rk3576-evb.dtsi"
 #include "rk3576-rk806.dtsi"