summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-mop500-regulators.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-04-04 10:44:51 +0200
committerLinus Walleij <linus.walleij@linaro.org>2011-06-21 10:57:42 +0200
commitdb24520f905430bd15eb49b5d9810ed445efe73a (patch)
treeabd4284d980a08f9dd437e209a087cc189775925 /arch/arm/mach-ux500/board-mop500-regulators.c
parent451a5edf0ed33f8ca9468ed89dc2a068d09e97be (diff)
mach-ux500: complete regulator constraints for MOP500 board
This board now has complete regulation constraints and can turn off unused regulators. For the moment we need to wire VAUX1 (V-DISPLAY rail) always on since it somehow affects the external MMC. Cc: Liam Girdwood <lrg@slimlogic.co.uk> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-regulators.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500-regulators.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 9ed0f90cfe2..c0bc833df90 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -272,7 +272,14 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
.max_uV = 2900000,
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
REGULATOR_CHANGE_STATUS,
- .boot_on = 1, /* must be on for display */
+ .boot_on = 1, /* display is on at boot */
+ /*
+ * This voltage cannot be disabled right now because
+ * it is somehow affecting the external MMC
+ * functionality, though that typically will use
+ * AUX3.
+ */
+ .always_on = 1,
},
.num_consumer_supplies = ARRAY_SIZE(ab8500_vaux1_consumers),
.consumer_supplies = ab8500_vaux1_consumers,