arm64: dts: rockchip: enable pcie_phy for Sapphire board

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 64a0ca755a0734deb3f0a90853ebd6649d8ce573..a3961115606a36e450e9584426e4c19257450bc8 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -111,26 +111,10 @@
                        sound-dai = <&i2s2>;
                };
                simple-audio-card,codec {
-                       sound-dai = <&dw_hdmi_audio>;
+                       sound-dai = <&hdmi>;
                };
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc_3v0>;              /* bt656_gpio2ab_ms */
-               audio-supply = <&vcca1v8_codec>;        /* 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_3v0>;
-       };
-
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk808 1>;
@@ -163,6 +147,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&host_vbus_drv>;
                regulator-name = "vcc5v0_host";
+               regulator-always-on;
        };
 
        vcc5v0_sys: vcc5v0-sys {
@@ -183,7 +168,7 @@
 
        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>;
@@ -221,9 +206,6 @@
 };
 
 &emmc_phy {
-       freq-sel = <200000000>;
-       dr-sel = <50>;
-       opdelay = <4>;
        status = "okay";
 };
 
@@ -485,6 +467,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&fusb0_int>;
                int-n-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+               vbus-5v-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
                status = "okay";
        };
 };
@@ -502,6 +485,19 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc_3v0>;              /* bt656_gpio2ab_ms */
+       audio-supply = <&vcca1v8_codec>;        /* audio_gpio3d4a_ms */
+       sdmmc-supply = <&vcc_sd>;               /* sdmmc_gpio4b_ms */
+       gpio1830-supply = <&vcc_3v0>;           /* gpio1833_gpio4cd_ms */
+};
+
+&pcie_phy {
+       status = "okay";
+};
+
 &pcie0 {
        assigned-clocks = <&cru SCLK_PCIEPHY_REF>;
        assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>;
@@ -513,6 +509,11 @@
        status = "okay";
 };
 
+&pmu_io_domains {
+       status = "okay";
+       pmu1830-supply = <&vcc_3v0>;
+};
+
 &pwm0 {
        status = "okay";
 };