From c19db671961efde0b6d3826c45908c785f93e1d4 Mon Sep 17 00:00:00 2001
From: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
Date: Wed, 16 Dec 2009 15:27:56 +0200
Subject: [PATCH] --- yaml --- r: 177733 b: refs/heads/master c:
 205e5cd3d933a9ea7b75630355c8f8ec5ef16f6c h: refs/heads/master i:   177731:
 ffd804937ba61fef930983c19ecce254157713e5 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/regulator/twl-regulator.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2357f0a07665..04a306122d16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07fc493f03019b5a98de1a498ab1b235afc394db
+refs/heads/master: 205e5cd3d933a9ea7b75630355c8f8ec5ef16f6c
diff --git a/trunk/drivers/regulator/twl-regulator.c b/trunk/drivers/regulator/twl-regulator.c
index 43d7494fbd8e..aadf4cfe354e 100644
--- a/trunk/drivers/regulator/twl-regulator.c
+++ b/trunk/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)) {