diff options
author | Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com> | 2009-12-11 05:12:15 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2009-12-13 13:21:59 -0500 |
commit | ab4abe056d8828341d2a7d6463b13eafaf210181 (patch) | |
tree | a38e751827567122136b5e978bb0b15a90b3bf47 | |
parent | be26d664de1a6333156bd586a2f795271cfcf170 (diff) |
mfd: Add all twl4030 regulators to the twl4030 mfd driver
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>
-rw-r--r-- | drivers/mfd/twl4030-core.c | 26 | ||||
-rw-r--r-- | include/linux/i2c/twl4030.h | 8 |
2 files changed, 30 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index 334c86fccede..e4a5d489b8e7 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c | |||
@@ -625,11 +625,21 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
625 | } | 625 | } |
626 | 626 | ||
627 | if (twl_has_regulator()) { | 627 | if (twl_has_regulator()) { |
628 | /* | ||
629 | child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); | 628 | child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); |
630 | if (IS_ERR(child)) | 629 | if (IS_ERR(child)) |
631 | return PTR_ERR(child); | 630 | return PTR_ERR(child); |
632 | */ | 631 | |
632 | child = add_regulator(TWL4030_REG_VIO, pdata->vio); | ||
633 | if (IS_ERR(child)) | ||
634 | return PTR_ERR(child); | ||
635 | |||
636 | child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1); | ||
637 | if (IS_ERR(child)) | ||
638 | return PTR_ERR(child); | ||
639 | |||
640 | child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2); | ||
641 | if (IS_ERR(child)) | ||
642 | return PTR_ERR(child); | ||
633 | 643 | ||
634 | child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1); | 644 | child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1); |
635 | if (IS_ERR(child)) | 645 | if (IS_ERR(child)) |
@@ -645,6 +655,18 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
645 | pdata->vaux2); | 655 | pdata->vaux2); |
646 | if (IS_ERR(child)) | 656 | if (IS_ERR(child)) |
647 | return PTR_ERR(child); | 657 | return PTR_ERR(child); |
658 | |||
659 | child = add_regulator(TWL4030_REG_VINTANA1, pdata->vintana1); | ||
660 | if (IS_ERR(child)) | ||
661 | return PTR_ERR(child); | ||
662 | |||
663 | child = add_regulator(TWL4030_REG_VINTANA2, pdata->vintana2); | ||
664 | if (IS_ERR(child)) | ||
665 | return PTR_ERR(child); | ||
666 | |||
667 | child = add_regulator(TWL4030_REG_VINTDIG, pdata->vintdig); | ||
668 | if (IS_ERR(child)) | ||
669 | return PTR_ERR(child); | ||
648 | } | 670 | } |
649 | 671 | ||
650 | /* maybe add LDOs that are omitted on cost-reduced parts */ | 672 | /* maybe add LDOs that are omitted on cost-reduced parts */ |
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h index efa62eb497b8..a50bcf8a4048 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl4030.h | |||
@@ -484,8 +484,12 @@ struct twl4030_platform_data { | |||
484 | struct regulator_init_data *vaux2; | 484 | struct regulator_init_data *vaux2; |
485 | struct regulator_init_data *vaux3; | 485 | struct regulator_init_data *vaux3; |
486 | struct regulator_init_data *vaux4; | 486 | struct regulator_init_data *vaux4; |
487 | 487 | struct regulator_init_data *vio; | |
488 | /* REVISIT more to come ... _nothing_ should be hard-wired */ | 488 | struct regulator_init_data *vdd1; |
489 | struct regulator_init_data *vdd2; | ||
490 | struct regulator_init_data *vintana1; | ||
491 | struct regulator_init_data *vintana2; | ||
492 | struct regulator_init_data *vintdig; | ||
489 | }; | 493 | }; |
490 | 494 | ||
491 | /*----------------------------------------------------------------------*/ | 495 | /*----------------------------------------------------------------------*/ |