summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2016-03-11 11:35:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-12 07:33:47 -0700
commit5af4e0bed45100e49468a8555dbf03f041a1b647 (patch)
treef6ada6fefb7072b5d73928d484c2fcb50733e45b /arch/arm
parent8daeb0405111da31185d718267a8cbf3ff945bc7 (diff)
downloadlwn-5af4e0bed45100e49468a8555dbf03f041a1b647.tar.gz
lwn-5af4e0bed45100e49468a8555dbf03f041a1b647.zip
ARM: dts: at91: sama5d4 Xplained: don't disable hsmci regulator
commit b02acd4e62602a6ab307da84388a16bf60106c48 upstream. If enabling the hsmci regulator on card detection, the board can reboot on sd card insertion. Keeping the regulator always enabled fixes this issue. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Fixes: 8d545f32bd77 ("ARM: at91/dt: sama5d4 xplained: add regulators for v(q)mmc1 supplies") Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/at91-sama5d4_xplained.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index 569026e8f96c..da84e65b56ef 100644
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -268,5 +268,6 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc_3v3_reg>;
+ regulator-always-on;
};
};