[PATCH 1/1] Regulator: Registering USB internal LDOs for TWL4030

[PATCH 1/1] Regulator: Registering USB internal LDOs for TWL4030

[Anuj Aggarwal]

Adding member variables for USB internal LDOs in twl4030_platform_data
and registering them in twl-core.c if the variables are populated
from board-evm file.

Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
---
 drivers/mfd/twl-core.c  |   12 ++++++++++++
 include/linux/i2c/twl.h |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 2a76065..6cde051 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -791,6 +791,18 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
 		child = add_regulator(TWL4030_REG_VAUX4, pdata->vaux4);
 		if (IS_ERR(child))
 			return PTR_ERR(child);
+
+		child = add_regulator(TWL4030_REG_VUSB1V5, pdata->vusb1v5);
+		if (IS_ERR(child))
+			return PTR_ERR(child);
+
+		child = add_regulator(TWL4030_REG_VUSB1V8, pdata->vusb1v8);
+		if (IS_ERR(child))
+			return PTR_ERR(child);
+
+		child = add_regulator(TWL4030_REG_VUSB3V1, pdata->vusb3v1);
+		if (IS_ERR(child))
+			return PTR_ERR(child);
 	}
 
 	/* twl6030 regulators */
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index bf1c5be..7be0b34 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -578,6 +578,10 @@ struct twl4030_platform_data {
 	struct regulator_init_data		*vintana1;
 	struct regulator_init_data		*vintana2;
 	struct regulator_init_data		*vintdig;
+	struct regulator_init_data		*vusb1v5;
+	struct regulator_init_data		*vusb1v8;
+	struct regulator_init_data		*vusb3v1;
+
 	/* TWL6030 LDO regulators */
 	struct regulator_init_data              *vmmc;
 	struct regulator_init_data              *vpp;
-- 
1.6.2.4

Re: [PATCH 1/1] Regulator: Registering USB internal LDOs for TWL4030

[Mark Brown]

On Mon, Jan 11, 2010 at 02:55:18PM +0530, Anuj Aggarwal wrote:
> Adding member variables for USB internal LDOs in twl4030_platform_data
> and registering them in twl-core.c if the variables are populated
> from board-evm file.

> Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

RE: [PATCH 1/1] Regulator: Registering USB internal LDOs for TWL4030

[Aggarwal, Anuj]

> -----Original Message-----
> From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com]
> Sent: Monday, January 11, 2010 4:26 PM
> To: Aggarwal, Anuj
> Cc: linux-omap@vger.kernel.org; lrg@slimlogic.co.uk
> Subject: Re: [PATCH 1/1] Regulator: Registering USB internal LDOs for
> TWL4030
> 
> On Mon, Jan 11, 2010 at 02:55:18PM +0530, Anuj Aggarwal wrote:
> > Adding member variables for USB internal LDOs in twl4030_platform_data
> > and registering them in twl-core.c if the variables are populated
> > from board-evm file.
> 
> > Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
> 
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tony,

Can you pull this patch? I have tried it on for-next tip, it applies
cleanly.

Re: [PATCH 1/1] Regulator: Registering USB internal LDOs for TWL4030

[Tony Lindgren]

* Aggarwal, Anuj <anuj.aggarwal@ti.com> [100301 22:21]:
> > -----Original Message-----
> > From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com]
> > Sent: Monday, January 11, 2010 4:26 PM
> > To: Aggarwal, Anuj
> > Cc: linux-omap@vger.kernel.org; lrg@slimlogic.co.uk
> > Subject: Re: [PATCH 1/1] Regulator: Registering USB internal LDOs for
> > TWL4030
> > 
> > On Mon, Jan 11, 2010 at 02:55:18PM +0530, Anuj Aggarwal wrote:
> > > Adding member variables for USB internal LDOs in twl4030_platform_data
> > > and registering them in twl-core.c if the variables are populated
> > > from board-evm file.
> > 
> > > Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
> > 
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Tony,
> 
> Can you pull this patch? I have tried it on for-next tip, it applies
> cleanly.

This needs to go to Samuel, see MAINTAINERS file for MFD.

Tony