summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress
diff options
context:
space:
mode:
authorPawel Moll <pawel.moll@arm.com>2014-11-28 17:44:31 +0100
committerArnd Bergmann <arnd@arndb.de>2014-11-28 21:57:07 +0100
commit1f1dd5889cf163f4b2302738bd22cde9e32125da (patch)
tree1b9b7e4f1793c21d1b6f8f0f36b425f1ae2da237 /arch/arm/mach-vexpress
parentMerge tag 'at91-cleanup4' of git://git.kernel.org/pub/scm/linux/kernel/git/nf... (diff)
downloadlinux-1f1dd5889cf163f4b2302738bd22cde9e32125da.tar.xz
linux-1f1dd5889cf163f4b2302738bd22cde9e32125da.zip
ARM: vexpress: Enable regulator framework when MMCI is in use
The MMCI driver, when used with a Device Tree described device, relies on the "vmmc" voltage regulator supply to set the OCR register voltage bits, using MMC core's mmc_regulator_get_supply() function. Without the regulator framework present there are no valid operating voltages reported and the device initialisation fails: mmci-pl18x 10005000.mmci: No vmmc regulator found mmci-pl18x 10005000.mmci: no support for card's volts mmc0: error -22 whilst initialising SD card Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r--arch/arm/mach-vexpress/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 9a96bab12ef3..d6b16d9a7838 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -16,6 +16,7 @@ menuconfig ARCH_VEXPRESS
select POWER_RESET
select POWER_RESET_VEXPRESS
select POWER_SUPPLY
+ select REGULATOR if MMC_ARMMMCI
select REGULATOR_FIXED_VOLTAGE if REGULATOR
select VEXPRESS_CONFIG
select VEXPRESS_SYSCFG