]> Pileus Git - ~andy/linux/blobdiff - arch/arm/mach-omap2/twl-common.c
Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus
[~andy/linux] / arch / arm / mach-omap2 / twl-common.c
index 7a7b89304c48eeb2e1af9f9b87f77d9d5dd5a6f1..43a979075338a76d03894e406952e9d6eb28c1ad 100644 (file)
@@ -31,6 +31,8 @@
 
 #include "twl-common.h"
 #include "pm.h"
+#include "voltage.h"
+#include "mux.h"
 
 static struct i2c_board_info __initdata pmic_i2c_board_info = {
        .addr           = 0x48,
@@ -47,6 +49,18 @@ static struct i2c_board_info __initdata omap4_i2c1_board_info[] = {
        },
 };
 
+static int twl_set_voltage(void *data, int target_uV)
+{
+       struct voltagedomain *voltdm = (struct voltagedomain *)data;
+       return voltdm_scale(voltdm, target_uV);
+}
+
+static int twl_get_voltage(void *data)
+{
+       struct voltagedomain *voltdm = (struct voltagedomain *)data;
+       return voltdm_get_voltage(voltdm);
+}
+
 void __init omap_pmic_init(int bus, u32 clkrate,
                           const char *pmic_type, int pmic_irq,
                           struct twl4030_platform_data *pmic_data)
@@ -64,6 +78,7 @@ void __init omap4_pmic_init(const char *pmic_type,
                    struct twl6040_platform_data *twl6040_data, int twl6040_irq)
 {
        /* PMIC part*/
+       omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);
        strncpy(omap4_i2c1_board_info[0].type, pmic_type,
                sizeof(omap4_i2c1_board_info[0].type));
        omap4_i2c1_board_info[0].irq = OMAP44XX_IRQ_SYS_1N;
@@ -153,6 +168,48 @@ 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,
+};
+
+static struct twl_regulator_driver_data omap3_vdd1_drvdata = {
+       .get_voltage = twl_get_voltage,
+       .set_voltage = twl_set_voltage,
+};
+
+static struct twl_regulator_driver_data omap3_vdd2_drvdata = {
+       .get_voltage = twl_get_voltage,
+       .set_voltage = twl_set_voltage,
+};
+
 void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
                                  u32 pdata_flags, u32 regulators_flags)
 {
@@ -160,6 +217,16 @@ 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) {
+               omap3_vdd1.driver_data = &omap3_vdd1_drvdata;
+               omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");
+               pmic_data->vdd1 = &omap3_vdd1;
+       }
+       if (!pmic_data->vdd2) {
+               omap3_vdd2.driver_data = &omap3_vdd2_drvdata;
+               omap3_vdd2_drvdata.data = voltdm_lookup("core");
+               pmic_data->vdd2 = &omap3_vdd2;
+       }
 
        /* Common platform data configurations */
        if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
@@ -201,6 +268,7 @@ static struct regulator_init_data omap4_vdac_idata = {
                .valid_ops_mask         = REGULATOR_CHANGE_MODE
                                        | REGULATOR_CHANGE_STATUS,
        },
+       .supply_regulator       = "V2V1",
 };
 
 static struct regulator_init_data omap4_vaux2_idata = {
@@ -291,6 +359,7 @@ static struct regulator_init_data omap4_vcxio_idata = {
        },
        .num_consumer_supplies  = ARRAY_SIZE(omap4_vcxio_supply),
        .consumer_supplies      = omap4_vcxio_supply,
+       .supply_regulator       = "V2V1",
 };
 
 static struct regulator_init_data omap4_vusb_idata = {
@@ -310,6 +379,105 @@ static struct regulator_init_data omap4_clk32kg_idata = {
        },
 };
 
+static struct regulator_consumer_supply omap4_vdd1_supply[] = {
+       REGULATOR_SUPPLY("vcc", "mpu.0"),
+};
+
+static struct regulator_consumer_supply omap4_vdd2_supply[] = {
+       REGULATOR_SUPPLY("vcc", "iva.0"),
+};
+
+static struct regulator_consumer_supply omap4_vdd3_supply[] = {
+       REGULATOR_SUPPLY("vcc", "l3_main.0"),
+};
+
+static struct regulator_init_data omap4_vdd1 = {
+       .constraints = {
+               .name                   = "vdd_mpu",
+               .min_uV                 = 500000,
+               .max_uV                 = 1500000,
+               .valid_modes_mask       = REGULATOR_MODE_NORMAL,
+               .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE,
+       },
+       .num_consumer_supplies          = ARRAY_SIZE(omap4_vdd1_supply),
+       .consumer_supplies              = omap4_vdd1_supply,
+};
+
+static struct regulator_init_data omap4_vdd2 = {
+       .constraints = {
+               .name                   = "vdd_iva",
+               .min_uV                 = 500000,
+               .max_uV                 = 1500000,
+               .valid_modes_mask       = REGULATOR_MODE_NORMAL,
+               .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE,
+       },
+       .num_consumer_supplies          = ARRAY_SIZE(omap4_vdd2_supply),
+       .consumer_supplies              = omap4_vdd2_supply,
+};
+
+static struct regulator_init_data omap4_vdd3 = {
+       .constraints = {
+               .name                   = "vdd_core",
+               .min_uV                 = 500000,
+               .max_uV                 = 1500000,
+               .valid_modes_mask       = REGULATOR_MODE_NORMAL,
+               .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE,
+       },
+       .num_consumer_supplies          = ARRAY_SIZE(omap4_vdd3_supply),
+       .consumer_supplies              = omap4_vdd3_supply,
+};
+
+
+static struct twl_regulator_driver_data omap4_vdd1_drvdata = {
+       .get_voltage = twl_get_voltage,
+       .set_voltage = twl_set_voltage,
+};
+
+static struct twl_regulator_driver_data omap4_vdd2_drvdata = {
+       .get_voltage = twl_get_voltage,
+       .set_voltage = twl_set_voltage,
+};
+
+static struct twl_regulator_driver_data omap4_vdd3_drvdata = {
+       .get_voltage = twl_get_voltage,
+       .set_voltage = twl_set_voltage,
+};
+
+static struct regulator_consumer_supply omap4_v1v8_supply[] = {
+       REGULATOR_SUPPLY("vio", "1-004b"),
+};
+
+static struct regulator_init_data omap4_v1v8_idata = {
+       .constraints = {
+               .min_uV                 = 1800000,
+               .max_uV                 = 1800000,
+               .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                       | REGULATOR_MODE_STANDBY,
+               .valid_ops_mask         = REGULATOR_CHANGE_MODE
+                                       | REGULATOR_CHANGE_STATUS,
+               .always_on              = true,
+       },
+       .num_consumer_supplies  = ARRAY_SIZE(omap4_v1v8_supply),
+       .consumer_supplies      = omap4_v1v8_supply,
+};
+
+static struct regulator_consumer_supply omap4_v2v1_supply[] = {
+       REGULATOR_SUPPLY("v2v1", "1-004b"),
+};
+
+static struct regulator_init_data omap4_v2v1_idata = {
+       .constraints = {
+               .min_uV                 = 2100000,
+               .max_uV                 = 2100000,
+               .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                       | REGULATOR_MODE_STANDBY,
+               .valid_ops_mask         = REGULATOR_CHANGE_MODE
+                                       | REGULATOR_CHANGE_STATUS,
+       },
+       .num_consumer_supplies  = ARRAY_SIZE(omap4_v2v1_supply),
+       .consumer_supplies      = omap4_v2v1_supply,
+};
+
 void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
                                  u32 pdata_flags, u32 regulators_flags)
 {
@@ -318,6 +486,24 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
        if (!pmic_data->irq_end)
                pmic_data->irq_end = TWL6030_IRQ_END;
 
+       if (!pmic_data->vdd1) {
+               omap4_vdd1.driver_data = &omap4_vdd1_drvdata;
+               omap4_vdd1_drvdata.data = voltdm_lookup("mpu");
+               pmic_data->vdd1 = &omap4_vdd1;
+       }
+
+       if (!pmic_data->vdd2) {
+               omap4_vdd2.driver_data = &omap4_vdd2_drvdata;
+               omap4_vdd2_drvdata.data = voltdm_lookup("iva");
+               pmic_data->vdd2 = &omap4_vdd2;
+       }
+
+       if (!pmic_data->vdd3) {
+               omap4_vdd3.driver_data = &omap4_vdd3_drvdata;
+               omap4_vdd3_drvdata.data = voltdm_lookup("core");
+               pmic_data->vdd3 = &omap4_vdd3;
+       }
+
        /* Common platform data configurations */
        if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
                pmic_data->usb = &omap4_usb_pdata;
@@ -350,5 +536,11 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
        if (regulators_flags & TWL_COMMON_REGULATOR_CLK32KG &&
            !pmic_data->clk32kg)
                pmic_data->clk32kg = &omap4_clk32kg_idata;
+
+       if (regulators_flags & TWL_COMMON_REGULATOR_V1V8 && !pmic_data->v1v8)
+               pmic_data->v1v8 = &omap4_v1v8_idata;
+
+       if (regulators_flags & TWL_COMMON_REGULATOR_V2V1 && !pmic_data->v2v1)
+               pmic_data->v2v1 = &omap4_v2v1_idata;
 }
 #endif /* CONFIG_ARCH_OMAP4 */