iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfd: Add all twl4030 regulators to the twl4030 mfd driver

Browse Source 
Add all twl4030 regulators to the twl4030 mfd driver and
twl4030_platform_data

Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Juha Keski-Saari 2009-12-11 11:12:15 +01:00 committed by Samuel Ortiz
parent be26d664de
commit ab4abe056d
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/mfd/twl4030-core.c
View File

@ -625,11 +625,21 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
} }
if (twl_has_regulator()) { if (twl_has_regulator()) {
/*
child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1);
if (IS_ERR(child)) if (IS_ERR(child))
return PTR_ERR(child); return PTR_ERR(child);
*/
child = add_regulator(TWL4030_REG_VIO, pdata->vio);
if (IS_ERR(child))
return PTR_ERR(child);
child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1);
if (IS_ERR(child))
return PTR_ERR(child);
child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2);
if (IS_ERR(child))
return PTR_ERR(child);
child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1); child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1);
if (IS_ERR(child)) if (IS_ERR(child))
@ -645,6 +655,18 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
pdata->vaux2); pdata->vaux2);
if (IS_ERR(child)) if (IS_ERR(child))
return PTR_ERR(child); return PTR_ERR(child);
child = add_regulator(TWL4030_REG_VINTANA1, pdata->vintana1);
if (IS_ERR(child))
return PTR_ERR(child);
child = add_regulator(TWL4030_REG_VINTANA2, pdata->vintana2);
if (IS_ERR(child))
return PTR_ERR(child);
child = add_regulator(TWL4030_REG_VINTDIG, pdata->vintdig);
if (IS_ERR(child))
return PTR_ERR(child);
} }
/* maybe add LDOs that are omitted on cost-reduced parts */ /* maybe add LDOs that are omitted on cost-reduced parts */

8
include/linux/i2c/twl4030.h
View File

@ -484,8 +484,12 @@ struct twl4030_platform_data {
struct regulator_init_data *vaux2; struct regulator_init_data *vaux2;
struct regulator_init_data *vaux3; struct regulator_init_data *vaux3;
struct regulator_init_data *vaux4; struct regulator_init_data *vaux4;
struct regulator_init_data *vio;
/* REVISIT more to come ... _nothing_ should be hard-wired */ struct regulator_init_data *vdd1;
struct regulator_init_data *vdd2;
struct regulator_init_data *vintana1;
struct regulator_init_data *vintana2;
struct regulator_init_data *vintdig;
}; };
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/