ARM64: dts: rk3399: add regulator-ramp-delay for dcdc

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
index 613e68a5a4f46acc8679d6aa3dea786c500c7aff..3f083c50c13180ab0efff3de06283aacf020ac2a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
@@ -83,6 +83,15 @@
                vin-supply = <&vcc_sys>;
        };
 
+       vcc5v0_host: vcc5v0-host-regulator {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&host_vbus_drv>;
+               regulator-name = "vcc5v0_host";
+       };
+
        vdd_center: vdd-center {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 0>;
@@ -141,6 +150,26 @@
                #sound-dai-cells = <0>;
        };
 
+       hdmi_sound: hdmi-sound {
+               status = "okay";
+               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>;
@@ -239,6 +268,10 @@
        #sound-dai-cells = <0>;
 };
 
+&i2s2 {
+       #sound-dai-cells = <0>;
+};
+
 &spdif {
        pinctrl-0 = <&spdif_bus_1>;
        status = "okay";
@@ -316,6 +349,7 @@
                                regulator-name = "vdd_log";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1350000>;
+                               regulator-ramp-delay = <6001>;
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
@@ -328,6 +362,7 @@
                                regulator-name = "vdd_cpu_l";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1350000>;
+                               regulator-ramp-delay = <6001>;
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
@@ -513,6 +548,32 @@
        status = "okay";
 };
 
+&u2phy0 {
+       status = "okay";
+
+       u2phy0_otg: otg-port {
+               status = "okay";
+       };
+
+       u2phy0_host: host-port {
+               phy-supply = <&vcc5v0_host>;
+               status = "okay";
+       };
+};
+
+&u2phy1 {
+       status = "okay";
+
+       u2phy1_otg: otg-port {
+               status = "okay";
+       };
+
+       u2phy1_host: host-port {
+               phy-supply = <&vcc5v0_host>;
+               status = "okay";
+       };
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_xfer &uart0_cts>;
@@ -523,10 +584,6 @@
        status = "okay";
 };
 
-&usb2phy {
-       vbus_drv-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
-};
-
 &usb_host0_ehci {
        status = "okay";
 };
@@ -548,7 +605,7 @@
 };
 
 &usbdrd_dwc3_0 {
-       dr_mode = "peripheral";
+       dr_mode = "otg";
        status = "okay";
 };
 
@@ -568,7 +625,7 @@
 &pwm3 {
        status = "disabled";
 
-       interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+       interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH 0>;
        compatible = "rockchip,remotectl-pwm";
        remote_pwm_id = <3>;
        handle_cpu_id = <0>;
@@ -706,6 +763,13 @@
                                <1 21 RK_FUNC_GPIO &pcfg_pull_up>;
                };
        };
+
+       usb2 {
+               host_vbus_drv: host-vbus-drv {
+                       rockchip,pins =
+                               <4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
 };
 
 &rk_screen {
@@ -718,6 +782,7 @@
 
 &fb {
        rockchip,disp-mode = <NO_DUAL>;
+       rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
 };
 
 &hdmi_rk_fb {
@@ -729,10 +794,3 @@
        status = "okay";
 };
 
-&dw_hdmi_audio {
-       status = "okay";
-};
-
-&hdmi_sound {
-       status = "okay";
-};