summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuha Keski-Saari <ext-juha.1.keski-saari@nokia.com>2009-12-16 15:27:56 +0200
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-12-17 10:27:28 +0000
commit205e5cd3d933a9ea7b75630355c8f8ec5ef16f6c (patch)
tree0cfe324c79e3afb39b070f93570b97c168897071
parent07fc493f03019b5a98de1a498ab1b235afc394db (diff)
downloadlinux-3.10-205e5cd3d933a9ea7b75630355c8f8ec5ef16f6c.tar.gz
linux-3.10-205e5cd3d933a9ea7b75630355c8f8ec5ef16f6c.tar.bz2
linux-3.10-205e5cd3d933a9ea7b75630355c8f8ec5ef16f6c.zip
twl-regulator: Define critical regulators as always_on
Defines VIO, VDD1, VDD2, VPLL1 and VINT* regulators as always_on by default since they are critical to TWL and its master's functionality and should be on in all cases where RegFW is used Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--drivers/regulator/twl-regulator.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 43d7494fbd8..aadf4cfe354 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -533,6 +533,19 @@ static int twlreg_probe(struct platform_device *pdev)
c->valid_ops_mask &= REGULATOR_CHANGE_VOLTAGE
| REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS;
+ switch (pdev->id) {
+ case TWL4030_REG_VIO:
+ case TWL4030_REG_VDD1:
+ case TWL4030_REG_VDD2:
+ case TWL4030_REG_VPLL1:
+ case TWL4030_REG_VINTANA1:
+ case TWL4030_REG_VINTANA2:
+ case TWL4030_REG_VINTDIG:
+ c->always_on = true;
+ break;
+ default:
+ break;
+ }
rdev = regulator_register(&info->desc, &pdev->dev, initdata, info);
if (IS_ERR(rdev)) {