From c59e8d086aaf89d0f48351ff7287708b57e5aba1 Mon Sep 17 00:00:00 2001 From: cl Date: Fri, 12 Dec 2014 17:59:56 +0800 Subject: [PATCH] rk312x: adjust dts relation Signed-off-by: cl --- arch/arm/boot/dts/rk3126-86v.dts | 6 ++++- arch/arm/boot/dts/rk3126-cif-sensor.dtsi | 2 -- arch/arm/boot/dts/rk3126-sdk.dts | 6 ++++- arch/arm/boot/dts/rk3126-sdk.dtsi | 32 ------------------------ arch/arm/boot/dts/rk3128-box-rk88.dts | 4 +++ arch/arm/boot/dts/rk3128-box.dts | 4 +++ arch/arm/boot/dts/rk3128-cif-sensor.dtsi | 2 -- arch/arm/boot/dts/rk3128-sdk.dts | 4 +++ arch/arm/boot/dts/rk312x-sdk.dtsi | 5 ---- 9 files changed, 22 insertions(+), 43 deletions(-) delete mode 100755 arch/arm/boot/dts/rk3126-sdk.dtsi diff --git a/arch/arm/boot/dts/rk3126-86v.dts b/arch/arm/boot/dts/rk3126-86v.dts index d145d917c149..90c1dbd51044 100755 --- 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 49651152be36..9aef52e22d14 100755 --- 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 56266e2cf0aa..ff2228d3bcfc 100755 --- 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 index 4ef2434411a7..000000000000 --- 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 a7af9bea2d3f..9c4e8d90ea15 100755 --- 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 diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts index 97d581e1db9c..023688b71f36 100755 --- 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 diff --git a/arch/arm/boot/dts/rk3128-cif-sensor.dtsi b/arch/arm/boot/dts/rk3128-cif-sensor.dtsi index 17e81fecec35..066b261aaadd 100755 --- 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 64dc3119fc46..6f930af286e1 100755 --- 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 ac7b2b3bc9d7..d99fbab9a5e2 100755 --- 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 { -- 2.34.1