From 0a754264ac40fda763a218e71ae7a28b0ecceee2 Mon Sep 17 00:00:00 2001
From: Wu Liangqing <wlq@rock-chips.com>
Date: Fri, 9 Sep 2022 02:21:52 +0000
Subject: [PATCH] arm64: dts: rockchip: px30/rk3326-evb move include
 px30-android.dtsi to dts

Change-Id: I338587c1573486aeaee774e8c704f575d64ca059
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
---
 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts  | 2 ++
 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts      | 2 ++
 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi     | 3 ---
 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts  | 2 ++
 arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts      | 2 ++
 arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts      | 2 ++
 arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi    | 1 +
 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts | 3 +++
 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts     | 3 +++
 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi    | 4 ----
 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts | 3 +++
 arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts     | 3 +++
 12 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts
index e9a56be8c394..f213818200a8 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts
@@ -4,6 +4,8 @@
  */
 
 /dts-v1/;
+#include "px30.dtsi"
+#include "px30-android.dtsi"
 #include "px30-evb-ddr3-v10.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts
index 4fe2ab7bf8ca..8d8bea85b1cd 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts
@@ -5,6 +5,8 @@
  */
 
 /dts-v1/;
+#include "px30.dtsi"
+#include "px30-android.dtsi"
 #include "px30-evb-ddr3-v10.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
index ee2a47830a35..271d78714944 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
@@ -3,14 +3,11 @@
  * Copyright (c) 2017-2019 Fuzhou Rockchip Electronics Co., Ltd
  */
 
-/dts-v1/;
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/display/drm_mipi_dsi.h>
 #include <dt-bindings/sensor-dev.h>
-#include "px30.dtsi"
-#include "px30-android.dtsi"
 
 / {
 	adc-keys {
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts
index f2659a7f524e..4e6170f8e691 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts
@@ -4,6 +4,8 @@
  */
 
 /dts-v1/;
+#include "px30.dtsi"
+#include "px30-android.dtsi"
 #include "px30-evb-ddr3-v10.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts
index 2e59a09d3c5c..a4429672e190 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts
@@ -4,6 +4,8 @@
  */
 
 /dts-v1/;
+#include "px30.dtsi"
+#include "px30-android.dtsi"
 #include "px30-evb-ddr3-v10.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
index ef9f356f9913..df920932b154 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
@@ -4,6 +4,8 @@
  */
 
 /dts-v1/;
+#include "px30.dtsi"
+#include "px30-android.dtsi"
 #include "px30-evb-ddr3-v10.dtsi"
 #include "px30-ddr4p416dd6-timing.dtsi"
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi
index 0eac63181407..f076787f5210 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi
@@ -7,6 +7,7 @@
 #include <dt-bindings/clock/rk618-cru.h>
 #include <dt-bindings/display/media-bus-format.h>
 #include "px30-evb-ddr3-v10.dtsi"
+#include "px30-android.dtsi"
 
 &dsi {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts
index 4c12a79f814b..274dccd08acc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts
@@ -4,7 +4,10 @@
  */
 
 /dts-v1/;
+#include "rk3326.dtsi"
+#include "px30-android.dtsi"
 #include "rk3326-evb-lp3-v10.dtsi"
+#include "rk3326-863-cif-sensor.dtsi"
 
 / {
 	model = "Rockchip rk3326 evb board";
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts
index 58bbfdafb489..cc2057e8f8c5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts
@@ -4,7 +4,10 @@
  */
 
 /dts-v1/;
+#include "rk3326.dtsi"
+#include "px30-android.dtsi"
 #include "rk3326-evb-lp3-v10.dtsi"
+#include "rk3326-863-cif-sensor.dtsi"
 
 / {
 	model = "Rockchip rk3326 evb board";
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
index 688b5be11be5..fbadb5259adc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
@@ -3,15 +3,11 @@
  * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
  */
 
-/dts-v1/;
 #include <dt-bindings/display/drm_mipi_dsi.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/sensor-dev.h>
-#include "rk3326.dtsi"
-#include "rk3326-863-cif-sensor.dtsi"
-#include "px30-android.dtsi"
 
 / {
 	adc-keys {
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts
index 2f0c3fc3a38d..0f2a35179f43 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts
@@ -4,7 +4,10 @@
  */
 
 /dts-v1/;
+#include "rk3326.dtsi"
+#include "px30-android.dtsi"
 #include "rk3326-evb-lp3-v10.dtsi"
+#include "rk3326-863-cif-sensor.dtsi"
 
 / {
 	model = "Rockchip rk3326 evb board";
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts
index 139efd9d1332..f8a3eef33f4e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts
@@ -4,7 +4,10 @@
  */
 
 /dts-v1/;
+#include "rk3326.dtsi"
+#include "px30-android.dtsi"
 #include "rk3326-evb-lp3-v10.dtsi"
+#include "rk3326-863-cif-sensor.dtsi"
 
 / {
 	model = "Rockchip rk3326 evb board";