From 6ff03d2d701b7d0c19b80b81b1d726e3c23014f0 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 24 May 2024 17:30:05 +0800 Subject: [PATCH] arm64: dts: rockchip: Move rk3576.dtsi out of rk3576-vehicle-evb.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: I0802429be68d58b087979cbd992fafacb8dff76e --- arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10-linux.dts | 1 + arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10.dts | 1 + arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10-linux.dts index 771054214be6..daef3cb12182 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10-linux.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include "rk3576.dtsi" #include "rk3576-vehicle-evb.dtsi" #include "rk3576-vehicle-evb-v10-nca9539-io-expander.dtsi" #include "rk3576-vehicle-serdes-mfd-display-maxim.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10.dts index 0639053a74c4..1f394a6194c4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v10.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include "rk3576.dtsi" #include "rk3576-vehicle-evb.dtsi" #include "rk3576-vehicle-evb-v10-nca9539-io-expander.dtsi" #include "rk3576-vehicle-serdes-mfd-display-maxim.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi index b47714cc4219..1f396ccb7d00 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi @@ -4,7 +4,6 @@ * */ -#include "rk3576.dtsi" #include "rk3576-vehicle.dtsi" #include "rk3576-rk806.dtsi"