aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmbresh K <ambresh@ti.com>2011-12-16 17:26:40 +0530
committerZiyann <jaraidaniel@gmail.com>2014-10-01 12:57:34 +0200
commitde5dec0188791d2ef29dec6f4fad162057e06b70 (patch)
treeb2ef09165f4de719d8d660f6129fecc4c76fcd82
parentedca5f47fa1380a6eece7e71ff2fbc68e3c35fbf (diff)
downloadkernel_samsung_tuna-de5dec0188791d2ef29dec6f4fad162057e06b70.zip
kernel_samsung_tuna-de5dec0188791d2ef29dec6f4fad162057e06b70.tar.gz
kernel_samsung_tuna-de5dec0188791d2ef29dec6f4fad162057e06b70.tar.bz2
MFD: TWL: 6030: Regulator: Add support for VCORE1 and VCORE2
VCORE1 and VCORE2 are added to platform data, so that it can be modelled as an SMPS adjustable regulator and the state of it can be controlled through drivers and board file. Change-Id: I070f7196879c4e989e401044761b02c9d4a067f3 Signed-off-by: Ambresh K <ambresh@ti.com>
-rw-r--r--drivers/mfd/twl-core.c10
-rw-r--r--drivers/regulator/twl-regulator.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index acc6507..38b9880 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -1014,6 +1014,16 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
if (IS_ERR(child))
return PTR_ERR(child);
+ child = add_regulator(TWL6030_REG_VDD1, pdata->vdd1,
+ features);
+ if (IS_ERR(child))
+ return PTR_ERR(child);
+
+ child = add_regulator(TWL6030_REG_VDD2, pdata->vdd2,
+ features);
+ if (IS_ERR(child))
+ return PTR_ERR(child);
+
child = add_regulator(TWL6030_REG_VDD3, pdata->vdd3,
features);
if (IS_ERR(child))
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index e9ee41a..1632e77 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1074,6 +1074,8 @@ static struct twlreg_info twl_regs[] = {
TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0),
TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0),
TWL6030_FIXED_RESOURCE(CLK32KAUDIO, 0x8F, 0),
+ TWL6030_ADJUSTABLE_SMPS(VDD1, 0x22, 600, 4000),
+ TWL6030_ADJUSTABLE_SMPS(VDD2, 0x28, 600, 4000),
TWL6030_ADJUSTABLE_SMPS(VDD3, 0x2e, 600, 4000),
TWL6030_ADJUSTABLE_SMPS(VMEM, 0x34, 600, 4000),
TWL6030_ADJUSTABLE_SMPS(V2V1, 0x1c, 1800, 2100),