mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rk312x: adjust dts relation

Browse Source 
Signed-off-by: cl <cl@rock-chips.com>
This commit is contained in:
cl
2014-12-12 17:59:56 +08:00
parent 037ab54084
commit c59e8d086a
9 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/rk3126-86v.dts
View File

@@ -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"
/ {

2
arch/arm/boot/dts/rk3126-cif-sensor.dtsi
View File

@@ -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{

6
arch/arm/boot/dts/rk3126-sdk.dts
View File

@@ -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";

32
arch/arm/boot/dts/rk3126-sdk.dtsi
View File

@@ -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";
};

4
arch/arm/boot/dts/rk3128-box-rk88.dts
View File

@@ -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>

4
arch/arm/boot/dts/rk3128-box.dts
View File

@@ -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>

2
arch/arm/boot/dts/rk3128-cif-sensor.dtsi
View File

@@ -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{

4
arch/arm/boot/dts/rk3128-sdk.dts
View File

@@ -1,3 +1,7 @@
/dts-v1/;
#include "rk3128.dtsi"
#include "rk3128-cif-sensor.dtsi"
#include "rk312x-sdk.dtsi"
#include "lcd-b101ew05.dtsi"

5
arch/arm/boot/dts/rk312x-sdk.dtsi
View File

@@ -1,8 +1,3 @@
/dts-v1/;
#include "rk312x.dtsi"
#include "rk3126-cif-sensor.dtsi"
#include "rk3128-cif-sensor.dtsi"
/ {
fiq-debugger {