Merge branches 'upstream-fixes' and 'magicmouse' into for-linus

[pandora-kernel.git] / arch / arm / mach-ux500 / board-mop500-regulators.c

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 0f2e522..2735d03 100644 (file)
--- 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,