arm64: dts: rockchip: keep vbus always on for usb2.0 host of rk3399

[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 984358b0160acc7883d77762e66073c601c7c54c..759babc4d468cd3f305ba2dbf384eb009c402373 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -42,6 +42,7 @@
 
 #include <dt-bindings/pwm/pwm.h>
 #include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
 
 / {
        compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
@@ -62,6 +63,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&host_vbus_drv>;
                regulator-name = "vcc5v0_host";
+               regulator-always-on;
        };
 
        backlight: backlight {
@@ -117,23 +119,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_dvp>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
-       pmu-io-domains {
-               compatible = "rockchip,rk3399-pmu-io-voltage-domain";
-               rockchip,grf = <&pmugrf>;
-
-               pmu1830-supply = <&vcc1v8_pmu>;
-       };
-
        es8316-sound {
                compatible = "simple-audio-card";
                simple-audio-card,format = "i2s";
@@ -220,6 +205,8 @@
 
        wireless-bluetooth {
                compatible = "bluetooth-platdata";
+               clocks = <&rk808 1>;
+               clock-names = "ext_clock";
                //wifi-bt-power-toggle;
                uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; /* GPIO2_C3 */
                pinctrl-names = "default", "rts_gpio";
@@ -231,6 +218,10 @@
                BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>; /* GPIO0_A4 */
                status = "okay";
        };
+
+       test-power {
+               status = "okay";
+       };
 };
 
 &cpu_l0 {
@@ -271,7 +262,7 @@
        cap-sd-highspeed;
        disable-wp;
        num-slots = <1>;
-       sd-uhs-sdr104;
+       //sd-uhs-sdr104;
        vqmmc-supply = <&vcc_sd>;
        pinctrl-names = "default";
        pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
@@ -279,8 +270,8 @@
 };
 
 &sdio0 {
-       clock-frequency = <50000000>;
-       clock-freq-min-max = <200000 50000000>;
+       clock-frequency = <150000000>;
+       clock-freq-min-max = <200000 150000000>;
        supports-sdio;
        bus-width = <4>;
        disable-wp;
@@ -303,6 +294,17 @@
        status = "okay";
 };
 
+&dfi {
+//     status = "okay";
+};
+
+&dmc {
+//     status = "okay";
+       center-supply = <&vdd_center>;
+       upthreshold = <60>;
+       downdifferential = <40>;
+};
+
 &sdhci {
        bus-width = <8>;
        mmc-hs400-1_8v;
@@ -366,17 +368,36 @@
                tp-size = <911>;
                tp-supply = <&vcc3v0_tp>;
        };
+
+       gsl3673: gsl3673@40 {
+               compatible = "GSL,GSL3673";
+               reg = <0x40>;
+               screen_max_x = <1536>;
+               screen_max_y = <2048>;
+               irq_gpio_number = <&gpio1 20 IRQ_TYPE_LEVEL_LOW>;
+               rst_gpio_number = <&gpio4 22 GPIO_ACTIVE_HIGH>;
+       };
+};
+
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
+&pcie_phy {
+       status = "disabled";
 };
 
 &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";
+       status = "disabled";
 };
 
 &tcphy0 {
@@ -514,6 +535,14 @@
                        rockchip,pins =
                                <1 18 RK_FUNC_GPIO &pcfg_pull_down>;
                };
+               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>;
+               };
        };
 
        usb2 {
@@ -533,3 +562,17 @@
                };
        };
 };
+
+&pvtm {
+       status = "okay";
+};
+
+&pmu_pvtm {
+       status = "okay";
+};
+
+&pmu_io_domains {
+       status = "okay";
+       pmu1830-supply = <&vcc1v8_pmu>;
+};
+