From: smj <smj@rock-chips.com>
Date: Fri, 28 Nov 2014 01:09:27 +0000 (+0800)
Subject: rk3036：SDK enable sdmmc
X-Git-Tag: firefly_0821_release~4434
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c31fb693eac671bc93cdbb8b6359a8158642c5f4;p=firefly-linux-kernel-4.4.55.git

rk3036：SDK enable sdmmc
        rk88 disable pwm_regulator

Signed-off-by: smj <smj@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3036-rk88.dts b/arch/arm/boot/dts/rk3036-rk88.dts
index 6e143149d9a1..5bedb7b3e965 100755
--- a/arch/arm/boot/dts/rk3036-rk88.dts
+++ b/arch/arm/boot/dts/rk3036-rk88.dts
@@ -21,7 +21,7 @@
 		rockchip,pwm_max_voltage= <1450000>;
 		rockchip,pwm_suspend_voltage= <1000000>;
 		rockchip,pwm_coefficient= <500>;
-		status = "okay";
+		status = "disabled";
 		regulators {
 			#address-cells = <1>;
 			#size-cells = <0>;
diff --git a/arch/arm/boot/dts/rk3036-sdk.dts b/arch/arm/boot/dts/rk3036-sdk.dts
index d79fe7dc6b6c..15a598b6abb1 100755
--- a/arch/arm/boot/dts/rk3036-sdk.dts
+++ b/arch/arm/boot/dts/rk3036-sdk.dts
@@ -185,7 +185,7 @@
 		keep-power-in-suspend;
 
 		//vmmc-supply = <&rk808_ldo5_reg>;
-		status = "disabled";
+		status = "okay";
 };
 
 &sdio {