[3.12,128/142] ARM: ux500: Enable GPIO regulator for SD-card for HREF boards

Message ID 9fd8c880af01243e71cc55248d7b1839730b189d.1431761807.git.jslaby@suse.cz
State New
Headers show

Commit Message

Jiri Slaby May 16, 2015, 7:38 a.m.
From: Ulf Hansson <ulf.hansson@linaro.org>

3.12-stable review patch.  If anyone has any objections, please let me know.

Patch

===============

commit f9a8c3914ba85f19c3360b19612d77c47adb8942 upstream.

Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 arch/arm/boot/dts/ste-href.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index b2d900157bb4..592f5a400ca8 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -119,8 +119,6 @@ 
 
 			states = <1800000 0x1
 				  2900000 0x0>;
-
-			status = "disabled";
 		};
 
 		// External Micro SD slot