From: Marek Belisko <marek@goldelico.com>
Date: Sat, 25 Jan 2014 21:28:57 +0000 (+0100)
Subject: ARM: dts: omap3-gta04: Fix mmc1 properties.
X-Git-Tag: v3.14-rc4~1^2~5^2~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2d6ac29e6a043c3adc3e82f5200ae1e07617e3ea;p=linux.git

ARM: dts: omap3-gta04: Fix mmc1 properties.

Does not have an aux supply, and must be non-removable.

Otherwise it is removed during suspend and filesystem gets confused.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/boot/dts/omap3-gta04.dts b/arch/arm/boot/dts/omap3-gta04.dts
index 81e0bb477bcd..c551e4af4d83 100644
--- a/arch/arm/boot/dts/omap3-gta04.dts
+++ b/arch/arm/boot/dts/omap3-gta04.dts
@@ -143,8 +143,8 @@ &mmc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc1_pins>;
 	vmmc-supply = <&vmmc1>;
-	vmmc_aux-supply = <&vsim>;
 	bus-width = <4>;
+	ti,non-removable;
 };
 
 &mmc2 {