arm64: dts: rk3399-box: fix dp and hdmi dclk parents

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
index cc72bf15aac5f14d2ec453e3c8afd66c6604542e..0ee56dc5b3a286a4ff719c380758686f6097bb25 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
@@ -87,11 +87,12 @@
                pinctrl-names = "default";
                pinctrl-0 = <&host_vbus_drv>;
                regulator-name = "vcc5v0_host";
+               regulator-always-on;
        };
 
        vdd_log: vdd-log {
                compatible = "pwm-regulator";
-               pwms = <&pwm2 0 25000 0>;
+               pwms = <&pwm2 0 25000 1>;
                regulator-name = "vdd_log";
                regulator-min-microvolt = <800000>;
                regulator-max-microvolt = <1400000>;
@@ -112,13 +113,6 @@
                #clock-cells = <0>;
        };
 
-       pmu-io-domains {
-               compatible = "rockchip,rk3399-pmu-io-voltage-domain";
-               rockchip,grf = <&pmugrf>;
-
-               pmu1830-supply = <&vcc_1v8>;
-       };
-
        spdif-sound {
                status = "okay";
                compatible = "simple-audio-card";
@@ -137,26 +131,6 @@
                #sound-dai-cells = <0>;
        };
 
-       hdmi_sound: hdmi-sound {
-               status = "disabled";
-               compatible = "simple-audio-card";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,mclk-fs = <256>;
-               simple-audio-card,name = "rockchip,hdmi";
-               simple-audio-card,cpu {
-                       sound-dai = <&i2s2>;
-               };
-               simple-audio-card,codec {
-                       sound-dai = <&dw_hdmi_audio>;
-               };
-       };
-
-       dw_hdmi_audio: dw-hdmi-audio {
-               status = "okay";
-               compatible = "rockchip,dw-hdmi-audio";
-               #sound-dai-cells = <0>;
-       };
-
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk808 1>;
@@ -203,6 +177,10 @@
        };
 };
 
+&hdmi_dp_sound {
+       status = "okay";
+};
+
 &sdmmc {
        clock-frequency = <100000000>;
        clock-freq-min-max = <100000 100000000>;
@@ -239,9 +217,6 @@
 };
 
 &emmc_phy {
-       freq-sel = <200000000>;
-       dr-sel = <50>;
-       opdelay = <4>;
        status = "okay";
 };
 
@@ -282,11 +257,13 @@
                compatible = "silergy,syr827";
                reg = <0x40>;
                regulator-compatible = "fan53555-reg";
+               pinctrl-0 = <&vsel1_gpio>;
+               vsel-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
                regulator-name = "vdd_cpu_b";
                regulator-min-microvolt = <712500>;
                regulator-max-microvolt = <1500000>;
                regulator-ramp-delay = <1000>;
-               fcs,suspend-voltage-selector = <0>;
+               fcs,suspend-voltage-selector = <1>;
                regulator-always-on;
                regulator-boot-on;
                vin-supply = <&vcc_sys>;
@@ -299,6 +276,8 @@
                compatible = "silergy,syr828";
                reg = <0x41>;
                regulator-compatible = "fan53555-reg";
+               pinctrl-0 = <&vsel2_gpio>;
+               vsel-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
                regulator-name = "vdd_gpu";
                regulator-min-microvolt = <712500>;
                regulator-max-microvolt = <1500000>;
@@ -530,10 +509,6 @@
        mali-supply = <&vdd_gpu>;
 };
 
-&rga {
-       status = "okay";
-};
-
 &threshold {
        temperature = <85000>;
 };
@@ -646,7 +621,7 @@
        interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH 0>;
        compatible = "rockchip,remotectl-pwm";
        remote_pwm_id = <3>;
-       handle_cpu_id = <0>;
+       handle_cpu_id = <1>;
 
        ir_key1 {
                rockchip,usercode = <0x4040>;
@@ -697,6 +672,7 @@
                        <0xa5   KEY_VOLUMEDOWN>,
                        <0xab   183>,
                        <0xb7   388>,
+                       <0xe8   388>,
                        <0xf8   184>,
                        <0xaf   185>,
                        <0xed   KEY_VOLUMEDOWN>,
@@ -763,46 +739,6 @@
        status = "okay";
 };
 
-&rk_screen {
-       #include <dt-bindings/display/screen-timing/lcd-box.dtsi>
-};
-
-&disp_timings {
-       native-mode = <&timing1>; /* 1080p */
-};
-
-&vopb_rk_fb {
-       status = "okay";
-};
-
-&vopl_rk_fb {
-       status = "okay";
-};
-
-&fb {
-       rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
-};
-
-&hdmi_rk_fb {
-       status = "okay";
-       rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC0>;
-       rockchip,phy_table =
-               <165000000 0 0 17 18 18 18>,
-               <340000000 0 2 17 14 14 14>,
-               <594000000 0 2 17  9  9  9>;
-};
-
-&cdn_dp_sound {
-       status = "okay";
-};
-
-&cdn_dp_fb {
-       status = "okay";
-       extcon = <&fusb0>;
-       phys = <&tcphy0_dp>;
-       dp_vop_sel = <DISPLAY_SOURCE_LCDC1>;
-};
-
 &i2s2 {
        status = "okay";
 };
@@ -843,6 +779,16 @@
                        rockchip,pins =
                                <1 21 RK_FUNC_GPIO &pcfg_pull_up>;
                };
+
+               vsel1_gpio: vsel1-gpio {
+                       rockchip,pins =
+                               <1 17 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
+
+               vsel2_gpio: vsel2-gpio {
+                       rockchip,pins =
+                               <1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
        };
 
        gmac {
@@ -860,3 +806,47 @@
 &pmu_pvtm {
        status = "okay";
 };
+
+&pmu_io_domains {
+       status = "okay";
+       pmu1830-supply = <&vcc_1v8>;
+};
+
+&rockchip_suspend {
+       status = "okay";
+       rockchip,sleep-debug-en = <0>;
+       rockchip,sleep-mode-config = <
+               (0
+               | RKPM_SLP_ARMPD
+               | RKPM_SLP_PERILPPD
+               | RKPM_SLP_DDR_RET
+               | RKPM_SLP_PLLPD
+               | RKPM_SLP_CENTER_PD
+               | RKPM_SLP_AP_PWROFF
+               )
+       >;
+       rockchip,wakeup-config = <
+               (0
+               | RKPM_GPIO_WKUP_EN
+               | RKPM_PWM_WKUP_EN
+               )
+       >;
+       rockchip,pwm-regulator-config = <
+               (0
+               | PWM2_REGULATOR_EN
+               )
+       >;
+       rockchip,power-ctrl =
+               <&gpio1 17 GPIO_ACTIVE_HIGH>,
+               <&gpio1 14 GPIO_ACTIVE_HIGH>;
+};
+
+&vopb {
+       assigned-clocks = <&cru DCLK_VOP0_DIV>;
+       assigned-clock-parents = <&cru PLL_VPLL>;
+};
+
+&vopl {
+       assigned-clocks = <&cru DCLK_VOP1_DIV>;
+       assigned-clock-parents = <&cru PLL_CPLL>;
+};