]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
mfd: twl-core: regulator configuration for twl6030 V1V8, V2V1 SMPS
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 28 Feb 2012 09:39:13 +0000 (15:09 +0530)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 11 Mar 2012 20:09:26 +0000 (20:09 +0000)
To be able to attach consumers to these supplies from board
files we need to have regulator_init_data for them.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/mfd/twl-core.c
include/linux/i2c/twl.h

index c788e363ed565bb10aff7c99102d3ecf08746517..d3cf5e8c1d020998cb19841f888cccbc707536a1 100644 (file)
@@ -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))
index f66c0311e448bf8d44f71b7e424a560b87945a6b..7fcab23c59cee7a7fe2fe3a2fdbadff49cb0571b 100644 (file)
@@ -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;