arm64: dts: rockchip: rk3399-evb: merge common part

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3399-evb.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
index bf4bd19822f271c335883552b9d1a46cc89f9e32..0523746eda36ed956d6f88d160225de7b2851b12 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -157,9 +157,10 @@
                };
        };
 
-       spdif-sound {
+       spdif_sound: spdif-sound {
+               status = "disabled";
                compatible = "simple-audio-card";
-               simple-audio-card,name = "rockchip,spdif";
+               simple-audio-card,name = "ROCKCHIP,SPDIF";
                simple-audio-card,cpu {
                        sound-dai = <&spdif>;
                };
@@ -169,6 +170,7 @@
        };
 
        spdif_out: spdif-out {
+               status = "disabled";
                compatible = "linux,spdif-dit";
                #sound-dai-cells = <0>;
        };
@@ -213,15 +215,46 @@
        };
 };
 
+&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 = <37500000>;
-       clock-freq-min-max = <400000 37500000>;
+       clock-frequency = <150000000>;
+       clock-freq-min-max = <400000 150000000>;
        supports-sd;
        bus-width = <4>;
        cap-mmc-highspeed;
        cap-sd-highspeed;
        disable-wp;
        num-slots = <1>;
+       sd-uhs-sdr104;
+       vqmmc-supply = <&vcc_sd>;
        pinctrl-names = "default";
        pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
        status = "okay";
@@ -257,6 +290,7 @@
        mmc-hs400-1_8v;
        supports-emmc;
        non-removable;
+       keep-power-in-suspend;
        mmc-hs400-enhanced-strobe;
        status = "okay";
 };
@@ -270,7 +304,6 @@
 };
 
 &spdif {
-       status = "okay";
        #sound-dai-cells = <0>;
 };
 
@@ -280,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>;
@@ -297,20 +346,15 @@
        };
 };
 
-&i2c1 {
+&pcie0 {
+       assigned-clocks = <&cru SCLK_PCIEPHY_REF>;
+       assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>;
+       assigned-clock-rates = <100000000>;
+       ep-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
+       num-lanes = <4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pcie_clkreqn>;
        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>;
-       };
 };
 
 &tsadc {
@@ -389,6 +433,10 @@
        status = "okay";
 };
 
+&saradc {
+       status = "okay";
+};
+
 &pinctrl {
        sdio-pwrseq {
                wifi_enable_h: wifi-enable-h {