]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arm: omap3: add common twl configurations for vdd1 and vdd2
authorTero Kristo <t-kristo@ti.com>
Mon, 20 Feb 2012 10:26:07 +0000 (12:26 +0200)
committerKevin Hilman <khilman@ti.com>
Wed, 7 Mar 2012 01:35:42 +0000 (17:35 -0800)
VDD1 and VDD2 are the core voltage regulators on OMAP3. VDD1 is used
to control MPU/IVA voltage, and VDD2 is used for CORE. These regulators
are needed by DVFS.

Voltage ranges for VDD1 and VDD2 are taken from twl4030/twl5030 data manuals:
- SWCS019L : TWL4030 ES3.1 Data Manual rev L
- SWCS030E : TWL5030 ES1.2 Data Manual rev E

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
arch/arm/mach-omap2/twl-common.c

index 10b20c652e5dc390026bc1eec5042ff351c387f4..913d6c3c4cb62e6837846b4e7d93ee0997e5c4fa 100644 (file)
@@ -126,6 +126,38 @@ static struct regulator_init_data omap3_vpll2_idata = {
        .consumer_supplies              = omap3_vpll2_supplies,
 };
 
+static struct regulator_consumer_supply omap3_vdd1_supply[] = {
+       REGULATOR_SUPPLY("vcc", "mpu.0"),
+};
+
+static struct regulator_consumer_supply omap3_vdd2_supply[] = {
+       REGULATOR_SUPPLY("vcc", "l3_main.0"),
+};
+
+static struct regulator_init_data omap3_vdd1 = {
+       .constraints = {
+               .name                   = "vdd_mpu_iva",
+               .min_uV                 = 600000,
+               .max_uV                 = 1450000,
+               .valid_modes_mask       = REGULATOR_MODE_NORMAL,
+               .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE,
+       },
+       .num_consumer_supplies          = ARRAY_SIZE(omap3_vdd1_supply),
+       .consumer_supplies              = omap3_vdd1_supply,
+};
+
+static struct regulator_init_data omap3_vdd2 = {
+       .constraints = {
+               .name                   = "vdd_core",
+               .min_uV                 = 600000,
+               .max_uV                 = 1450000,
+               .valid_modes_mask       = REGULATOR_MODE_NORMAL,
+               .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE,
+       },
+       .num_consumer_supplies          = ARRAY_SIZE(omap3_vdd2_supply),
+       .consumer_supplies              = omap3_vdd2_supply,
+};
+
 void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
                                  u32 pdata_flags, u32 regulators_flags)
 {
@@ -133,6 +165,10 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
                pmic_data->irq_base = TWL4030_IRQ_BASE;
        if (!pmic_data->irq_end)
                pmic_data->irq_end = TWL4030_IRQ_END;
+       if (!pmic_data->vdd1)
+               pmic_data->vdd1 = &omap3_vdd1;
+       if (!pmic_data->vdd2)
+               pmic_data->vdd2 = &omap3_vdd2;
 
        /* Common platform data configurations */
        if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)