diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-04-04 10:44:51 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2011-06-21 10:57:42 +0200 |
| commit | db24520f905430bd15eb49b5d9810ed445efe73a (patch) | |
| tree | abd4284d980a08f9dd437e209a087cc189775925 /arch/arm/mach-ux500 | |
| parent | 451a5edf0ed33f8ca9468ed89dc2a068d09e97be (diff) | |
| download | linux-stable-db24520f905430bd15eb49b5d9810ed445efe73a.tar.gz linux-stable-db24520f905430bd15eb49b5d9810ed445efe73a.tar.bz2 linux-stable-db24520f905430bd15eb49b5d9810ed445efe73a.zip | |
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')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 9ed0f90cfe23..c0bc833df903 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, diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index bb26f40493e6..c64d6aa1355c 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -458,6 +458,9 @@ static void __init mop500_init_machine(void) i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); i2c_register_board_info(2, mop500_i2c2_devices, ARRAY_SIZE(mop500_i2c2_devices)); + + /* This board has full regulator constraints */ + regulator_has_full_constraints(); } MACHINE_START(U8500, "ST-Ericsson MOP500 platform") |