From ce436daca4dd67a4b2d9e13c2a57e3a49f4a1c62 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Fri, 15 Jul 2016 14:38:37 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3399-evb: merge common part dtbs is same as before. Change-Id: I0381607627905b98dee7962f8e62844c877fcd54 Signed-off-by: Huang, Tao --- .../boot/dts/rockchip/rk3399-evb-rev1.dtsi | 30 --------- .../boot/dts/rockchip/rk3399-evb-rev2.dtsi | 30 --------- arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi | 61 ++++++++++++++----- 3 files changed, 45 insertions(+), 76 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi index 2d68c158d6d3..9a609d77dfa1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi @@ -256,36 +256,6 @@ }; }; -&cpu_l0 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_l1 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_l2 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_l3 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_b0 { - cpu-supply = <&vdd_cpu_b>; -}; - -&cpu_b1 { - cpu-supply = <&vdd_cpu_b>; -}; - -&gpu { - status = "okay"; - mali-supply = <&vdd_gpu>; -}; - &pwm2 { status = "okay"; }; - diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi index 0d6bd161635e..1d1f41063f81 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi @@ -410,33 +410,3 @@ }; }; }; - -&cpu_l0 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_l1 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_l2 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_l3 { - cpu-supply = <&vdd_cpu_l>; -}; - -&cpu_b0 { - cpu-supply = <&vdd_cpu_b>; -}; - -&cpu_b1 { - cpu-supply = <&vdd_cpu_b>; -}; - -&gpu { - status = "okay"; - mali-supply = <&vdd_gpu>; -}; - diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi index 7e3f588cc088..0523746eda36 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -215,6 +215,35 @@ }; }; +&cpu_l0 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l1 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_l>; +}; + +&cpu_b0 { + cpu-supply = <&vdd_cpu_b>; +}; + +&cpu_b1 { + cpu-supply = <&vdd_cpu_b>; +}; + +&gpu { + status = "okay"; + mali-supply = <&vdd_gpu>; +}; + &sdmmc { clock-frequency = <150000000>; clock-freq-min-max = <400000 150000000>; @@ -284,6 +313,22 @@ i2c-scl-falling-time-ns = <15>; }; +&i2c1 { + status = "okay"; + i2c-scl-rising-time-ns = <300>; + i2c-scl-falling-time-ns = <15>; + + es8316: es8316@10 { + #sound-dai-cells = <0>; + compatible = "everest,es8316"; + reg = <0x10>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; + spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; + hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>; + }; +}; + &i2c4 { status = "okay"; i2c-scl-rising-time-ns = <600>; @@ -301,22 +346,6 @@ }; }; -&i2c1 { - status = "okay"; - i2c-scl-rising-time-ns = <300>; - i2c-scl-falling-time-ns = <15>; - - es8316: es8316@10 { - #sound-dai-cells = <0>; - compatible = "everest,es8316"; - reg = <0x10>; - clocks = <&cru SCLK_I2S_8CH_OUT>; - clock-names = "mclk"; - spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; - hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>; - }; -}; - &pcie0 { assigned-clocks = <&cru SCLK_PCIEPHY_REF>; assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>; -- 2.34.1