rk312x: adjust dts relation

Signed-off-by: cl <cl@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3126-86v.dts b/arch/arm/boot/dts/rk3126-86v.dts
index d145d917c14915be83609794fd331f6ce82868ab..90c1dbd5104473ee244e2741b015b44e39b939ff 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-86v.dts
+++ b/arch/arm/boot/dts/rk3126-86v.dts
@@ -1,5 +1,9 @@
-#include "rk3126-sdk.dtsi"
+/dts-v1/;
+
+#include "rk3126.dtsi"
 #include "lcd-86v-rgb1024x600.dtsi"
+#include "rk3126-cif-sensor.dtsi"
+#include "rk312x-sdk.dtsi"
 //#include "lcd-y81349.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/rk3126-cif-sensor.dtsi b/arch/arm/boot/dts/rk3126-cif-sensor.dtsi
index 49651152be3603c7f5f6c41a43f824fe508be66d..9aef52e22d1466b4cd2dcb0044ae3a4ae78febc1 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-cif-sensor.dtsi
+++ b/arch/arm/boot/dts/rk3126-cif-sensor.dtsi
@@ -1,5 +1,3 @@
-#include "rk312x.dtsi" 
-#include "rk312x-pinctrl.dtsi"
 #include "../../mach-rockchip/rk_camera_sensor_info.h"
 /{
        rk3126_cif_sensor: rk3126_cif_sensor{

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 56266e2cf0aadf0cb0afb260554da728d1d0b1b6..ff2228d3bcfc1c79f200cc8c1a54d75a101631a4 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -1,5 +1,9 @@
-#include "rk3126-sdk.dtsi"
+/dts-v1/;
+
+#include "rk3126.dtsi"
 #include "lcd-b101ew05.dtsi"
+#include "rk3126-cif-sensor.dtsi"
+#include "rk312x-sdk.dtsi"
 
 / {
         compatible = "rockchip,rk3126";

diff --git a/arch/arm/boot/dts/rk3126-sdk.dtsi b/arch/arm/boot/dts/rk3126-sdk.dtsi
deleted file mode 100755 (executable)
index 4ef2434..0000000
--- a/arch/arm/boot/dts/rk3126-sdk.dtsi
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "rk312x-sdk.dtsi"
-
-&clk_gpll_div2 {
-       clocks = <&dummy>;
-};
-
-&clk_gpll_div3 {
-       clocks = <&dummy>;
-};
-
-&rockchip_clocks_init {
-       rockchip,clocks-init-parent =
-               <&clk_core &clk_apll>, <&aclk_cpu &clk_gpll>,
-               <&aclk_peri &clk_gpll>, <&clk_uart0_pll &clk_gpll>,
-               <&clk_uart2_pll &clk_gpll>, <&clk_i2s_2ch_pll &clk_gpll>,
-               <&clk_i2s_8ch_pll &clk_gpll>, <&clk_spdif_pll &clk_gpll>,
-               <&clk_vepu &clk_gpll>, <&clk_vdpu &clk_gpll>,
-               <&clk_hevc_core &clk_gpll>, <&aclk_vio0_pre &clk_gpll>,
-               <&aclk_vio1_pre &clk_gpll>, <&hclk_vio_pre &clk_gpll>,
-               <&sclk_lcdc0 &clk_cpll>, <&clk_gpu &clk_gpll>,
-               <&clk_cif_pll &clk_gpll>, <&dclk_ebc &clk_gpll>,
-               <&clk_emmc &clk_gpll>, <&clk_sdio &clk_gpll>,
-               <&clk_sfc &clk_gpll>, <&clk_sdmmc0 &clk_gpll>,
-               <&clk_tsp &clk_gpll>, <&clk_nandc &clk_gpll>,
-               <&clk_mac_pll &clk_cpll>;
-};
-
-&i2s0 {
-       /* sdi: 0: from io, 1: from acodec */
-       sdi_source = <1>;
-       status = "okay";
-};
\ No newline at end of file

diff --git a/arch/arm/boot/dts/rk3128-box-rk88.dts b/arch/arm/boot/dts/rk3128-box-rk88.dts
index a7af9bea2d3f5f6a3b70daad10eddecd20b0bc75..9c4e8d90ea158c01e7080188b040de23aafda42b 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box-rk88.dts
+++ b/arch/arm/boot/dts/rk3128-box-rk88.dts
@@ -1,3 +1,7 @@
+/dts-v1/;
+
+#include "rk3128.dtsi"
+#include "rk3128-cif-sensor.dtsi"
 #include "rk312x-sdk.dtsi"
 #include "lcd-box.dtsi"
 #include <dt-bindings/input/input.h>

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index 97d581e1db9cf752d1a1830139af73764f95823a..023688b71f36b6030176b4331df6316af7ada2ca 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -1,3 +1,7 @@
+/dts-v1/;
+
+#include "rk3128.dtsi"
+#include "rk3128-cif-sensor.dtsi"
 #include "rk312x-sdk.dtsi"
 #include "lcd-box.dtsi"
 #include <dt-bindings/input/input.h>

diff --git a/arch/arm/boot/dts/rk3128-cif-sensor.dtsi b/arch/arm/boot/dts/rk3128-cif-sensor.dtsi
index 17e81fecec35998ba412b372d95ec5c05b12cf26..066b261aaaddfda708716bb0be89ec15ca09a289 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-cif-sensor.dtsi
+++ b/arch/arm/boot/dts/rk3128-cif-sensor.dtsi
@@ -1,5 +1,3 @@
-#include "rk312x.dtsi" 
-#include "rk312x-pinctrl.dtsi"
 #include "../../mach-rockchip/rk_camera_sensor_info.h"
 /{
        rk3128_cif_sensor: rk3128_cif_sensor{

diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 64dc3119fc463917c2bc4f0a8aa43cc62cd840a0..6f930af286e10d9ca02fa7077e498ab9827f3bda 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -1,3 +1,7 @@
+/dts-v1/;
+
+#include "rk3128.dtsi"
+#include "rk3128-cif-sensor.dtsi"
 #include "rk312x-sdk.dtsi"
 #include "lcd-b101ew05.dtsi"
 

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index ac7b2b3bc9d728293725feb51a182d5b5d4925db..d99fbab9a5e24d4fa1e0ca410af61de7cc1d6f09 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -1,8 +1,3 @@
-/dts-v1/;
-
-#include "rk312x.dtsi"
-#include "rk3126-cif-sensor.dtsi"
-#include "rk3128-cif-sensor.dtsi"
 
 / {
        fiq-debugger {