From b06d188df28fbf0c1f4394867e8e0b0ddf15a043 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 28 Feb 2012 15:09:13 +0530 Subject: [PATCH] --- yaml --- r: 292096 b: refs/heads/master c: 46eda3e96a65b378041c79c51ff2e02009f7e2d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl-core.c | 10 ++++++++++ trunk/include/linux/i2c/twl.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4ec6226aba37..7075963dc674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9d47fa4ebb9382bc3282fc13ad28a4e2a1a089e +refs/heads/master: 46eda3e96a65b378041c79c51ff2e02009f7e2d0 diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c index c788e363ed56..d3cf5e8c1d02 100644 --- a/trunk/drivers/mfd/twl-core.c +++ b/trunk/drivers/mfd/twl-core.c @@ -964,6 +964,16 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) if (IS_ERR(child)) return PTR_ERR(child); + child = add_regulator(TWL6030_REG_V1V8, pdata->v1v8, + features); + if (IS_ERR(child)) + return PTR_ERR(child); + + child = add_regulator(TWL6030_REG_V2V1, pdata->v2v1, + features); + if (IS_ERR(child)) + return PTR_ERR(child); + child = add_regulator(TWL6030_REG_VMMC, pdata->vmmc, features); if (IS_ERR(child)) diff --git a/trunk/include/linux/i2c/twl.h b/trunk/include/linux/i2c/twl.h index f66c0311e448..7fcab23c59ce 100644 --- a/trunk/include/linux/i2c/twl.h +++ b/trunk/include/linux/i2c/twl.h @@ -734,6 +734,8 @@ struct twl4030_platform_data { struct regulator_init_data *vcxio; struct regulator_init_data *vusb; struct regulator_init_data *clk32kg; + struct regulator_init_data *v1v8; + struct regulator_init_data *v2v1; /* TWL6025 LDO regulators */ struct regulator_init_data *ldo1; struct regulator_init_data *ldo2;