From b1098ad39bbd3264831fd44adcc84b2f4b0c5ea4 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 24 May 2024 17:30:04 +0800 Subject: [PATCH] arm64: dts: rockchip: Move rk3576.dtsi out of rk3576-test1.dtsi Allow the final dts to modify the contents of rk3576.dtsi, e.g. including rk3576-cpu-swap.dtsi Signed-off-by: Tao Huang Change-Id: I009a72420f50344ad9173fe9b83ac81057c3f349 --- arch/arm64/boot/dts/rockchip/rk3576-test1-v10-eink.dts | 1 + arch/arm64/boot/dts/rockchip/rk3576-test1-v10-linux.dts | 1 + arch/arm64/boot/dts/rockchip/rk3576-test1-v10-mcu-k350c4516t.dts | 1 + .../boot/dts/rockchip/rk3576-test1-v10-rgb-Q7050ITH2641AA1T.dts | 1 + .../boot/dts/rockchip/rk3576-test1-v10-rk628-bt1120-2-hdmi.dts | 1 + arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-hdmi2gvi.dts | 1 + .../dts/rockchip/rk3576-test1-v10-sii9022-bt1120-to-hdmi.dts | 1 + .../boot/dts/rockchip/rk3576-test1-v10-sii9022-rgb2hdmi.dts | 1 + .../dts/rockchip/rk3576-test1-v10-vopl-mipi-display-linux.dts | 1 + arch/arm64/boot/dts/rockchip/rk3576-test1-v10.dts | 1 + arch/arm64/boot/dts/rockchip/rk3576-test1.dtsi | 1 - 11 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-eink.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-eink.dts index 379fdd519f95..251b6ca83212 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-eink.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-eink.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-linux.dts index a2ce31350a85..f7930f6d67a5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-linux.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-mcu-k350c4516t.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-mcu-k350c4516t.dts index 4377ff712492..fe48efe63541 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-mcu-k350c4516t.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-mcu-k350c4516t.dts @@ -7,6 +7,7 @@ /dts-v1/; #include +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rgb-Q7050ITH2641AA1T.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rgb-Q7050ITH2641AA1T.dts index 29617ddfee65..bcefa3061978 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rgb-Q7050ITH2641AA1T.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rgb-Q7050ITH2641AA1T.dts @@ -7,6 +7,7 @@ /dts-v1/; #include +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-bt1120-2-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-bt1120-2-hdmi.dts index 0b582a03b5a9..908fc3a26527 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-bt1120-2-hdmi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-bt1120-2-hdmi.dts @@ -7,6 +7,7 @@ /dts-v1/; #include +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-hdmi2gvi.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-hdmi2gvi.dts index b52feeb7ab58..7b0ad4322d86 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-hdmi2gvi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-rk628-hdmi2gvi.dts @@ -7,6 +7,7 @@ /dts-v1/; #include +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-bt1120-to-hdmi.dts index dda78d588002..b4dc94fe1da3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-bt1120-to-hdmi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-bt1120-to-hdmi.dts @@ -7,6 +7,7 @@ /dts-v1/; #include +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-rgb2hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-rgb2hdmi.dts index d91e682bf8ce..618533f80146 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-rgb2hdmi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-sii9022-rgb2hdmi.dts @@ -7,6 +7,7 @@ /dts-v1/; #include +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-vopl-mipi-display-linux.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-vopl-mipi-display-linux.dts index b3d0b4051fd3..55d430fc772b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-vopl-mipi-display-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10-vopl-mipi-display-linux.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10.dts index 039246c0ab15..6b017c80a152 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1-v10.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include "rk3576.dtsi" #include "rk3576-test1.dtsi" #include "rk3576-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-test1.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-test1.dtsi index 4b5f9c36d9b8..5c439a2bade1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-test1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-test1.dtsi @@ -5,7 +5,6 @@ */ #include -#include "rk3576.dtsi" #include "rk3576-evb.dtsi" #include "rk3576-rk806.dtsi"