arm64: dts: rockchip: enable usb3 controller for rk3328-evb

[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 8e69c562e2564f1bc32f1700237f7ee2efb2a208..dc5644e85a6f1ff40ef0140f44e422b0c1033c8c 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,16 @@
                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";
+               regulator-always-on;
+       };
+
        vdd_center: vdd-center {
                compatible = "pwm-regulator";
                pwms = <&pwm2 0 25000 0>;
@@ -106,23 +116,6 @@
                #clock-cells = <0>;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */
-               audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */
-               sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */
-               gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */
-       };
-
-       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";
@@ -141,6 +134,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>;
@@ -181,6 +194,15 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */
+       audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */
+       sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */
+       gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */
+};
+
 &sdmmc {
        clock-frequency = <150000000>;
        clock-freq-min-max = <400000 150000000>;
@@ -216,9 +238,6 @@
 };
 
 &emmc_phy {
-       freq-sel = <200000000>;
-       dr-sel = <50>;
-       opdelay = <4>;
        status = "okay";
 };
 
@@ -239,7 +258,12 @@
        #sound-dai-cells = <0>;
 };
 
+&i2s2 {
+       #sound-dai-cells = <0>;
+};
+
 &spdif {
+       pinctrl-0 = <&spdif_bus_1>;
        status = "okay";
        #sound-dai-cells = <0>;
 };
@@ -315,6 +339,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 {
@@ -327,6 +352,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 {
@@ -512,6 +538,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>;
@@ -522,10 +574,6 @@
        status = "okay";
 };
 
-&usb2phy {
-       vbus_drv-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
-};
-
 &usb_host0_ehci {
        status = "okay";
 };
@@ -547,7 +595,7 @@
 };
 
 &usbdrd_dwc3_0 {
-       dr_mode = "peripheral";
+       dr_mode = "otg";
        status = "okay";
 };
 
@@ -567,7 +615,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>;
@@ -705,6 +753,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 {
@@ -717,6 +772,7 @@
 
 &fb {
        rockchip,disp-mode = <NO_DUAL>;
+       rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
 };
 
 &hdmi_rk_fb {
@@ -728,10 +784,8 @@
        status = "okay";
 };
 
-&dw_hdmi_audio {
+&pmu_io_domains {
        status = "okay";
+       pmu1830-supply = <&vcc_1v8>;
 };
 
-&hdmi_sound {
-       status = "okay";
-};