X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Farm64%2Fboot%2Fdts%2Frockchip%2Frk3399-evb.dtsi;h=028a2173723d386ca4130f789e96eddf8240e5b9;hb=166ce57b57dd71e86bc70c7135dd8ef870dae126;hp=16f02111dc36c858335d9431c70e0714f1cef86e;hpb=949eacf000fefd4517b7cf3018b3853f5d7fccf7;p=firefly-linux-kernel-4.4.55.git

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
index 16f02111dc36..028a2173723d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -63,6 +63,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&host_vbus_drv>;
 		regulator-name = "vcc5v0_host";
+		regulator-always-on;
 	};
 
 	backlight: backlight {
@@ -118,13 +119,6 @@
 		regulator-boot-on;
 	};
 
-	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";
@@ -294,9 +288,6 @@
 };
 
 &emmc_phy {
-	freq-sel = <200000000>;
-	dr-sel = <50>;
-	opdelay = <4>;
 	status = "okay";
 };
 
@@ -402,7 +393,7 @@
 	ep-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
 	num-lanes = <4>;
 	pinctrl-names = "default";
-	pinctrl-0 = <&pcie_clkreqn>;
+	pinctrl-0 = <&pcie_clkreqn_cpm>;
 	status = "disabled";
 };
 
@@ -576,3 +567,9 @@
 &pmu_pvtm {
 	status = "okay";
 };
+
+&pmu_io_domains {
+	status = "okay";
+	pmu1830-supply = <&vcc1v8_pmu>;
+};
+