regulator: palmas: implement sleep mode configuration
[linux-2.6.git] / drivers / regulator / tps65023-regulator.c
index cd6d4fc..43e4902 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/regmap.h>
 
 /* Register definitions */
 #define        TPS65023_REG_VERSION            0
 #define TPS65023_REG_CTRL_LDO2_EN      BIT(2)
 #define TPS65023_REG_CTRL_LDO1_EN      BIT(1)
 
+/* REG_CTRL2 bitfields */
+#define TPS65023_REG_CTRL2_GO          BIT(7)
+#define TPS65023_REG_CTRL2_CORE_ADJ    BIT(6)
+#define TPS65023_REG_CTRL2_DCDC2       BIT(2)
+#define TPS65023_REG_CTRL2_DCDC1       BIT(1)
+#define TPS65023_REG_CTRL2_DCDC3       BIT(0)
+
 /* LDO_CTRL bitfields */
 #define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id)   ((ldo_id)*4)
 #define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id)    (0xF0 >> ((ldo_id)*4))
@@ -84,7 +92,7 @@
 #define TPS65023_MAX_REG_ID            TPS65023_LDO_2
 
 /* Supported voltage values for regulators */
-static const u16 VDCDC1_VSEL_table[] = {
+static const u16 VCORE_VSEL_table[] = {
        800, 825, 850, 875,
        900, 925, 950, 975,
        1000, 1025, 1050, 1075,
@@ -95,20 +103,29 @@ static const u16 VDCDC1_VSEL_table[] = {
        1500, 1525, 1550, 1600,
 };
 
-static const u16 LDO1_VSEL_table[] = {
+/* Supported voltage values for LDO regulators for tps65020 */
+static const u16 TPS65020_LDO1_VSEL_table[] = {
+       1000, 1050, 1100, 1300,
+       1800, 2500, 3000, 3300,
+};
+
+static const u16 TPS65020_LDO2_VSEL_table[] = {
+       1000, 1050, 1100, 1300,
+       1800, 2500, 3000, 3300,
+};
+
+/* Supported voltage values for LDO regulators
+ * for tps65021 and tps65023 */
+static const u16 TPS65023_LDO1_VSEL_table[] = {
        1000, 1100, 1300, 1800,
        2200, 2600, 2800, 3150,
 };
 
-static const u16 LDO2_VSEL_table[] = {
+static const u16 TPS65023_LDO2_VSEL_table[] = {
        1050, 1200, 1300, 1800,
        2500, 2800, 3000, 3300,
 };
 
-static unsigned int num_voltages[] = {ARRAY_SIZE(VDCDC1_VSEL_table),
-                               0, 0, ARRAY_SIZE(LDO1_VSEL_table),
-                               ARRAY_SIZE(LDO2_VSEL_table)};
-
 /* Regulator specific details */
 struct tps_info {
        const char *name;
@@ -125,109 +142,31 @@ struct tps_pmic {
        struct i2c_client *client;
        struct regulator_dev *rdev[TPS65023_NUM_REGULATOR];
        const struct tps_info *info[TPS65023_NUM_REGULATOR];
-       struct mutex io_lock;
+       struct regmap *regmap;
+       u8 core_regulator;
 };
 
-static inline int tps_65023_read(struct tps_pmic *tps, u8 reg)
-{
-       return i2c_smbus_read_byte_data(tps->client, reg);
-}
-
-static inline int tps_65023_write(struct tps_pmic *tps, u8 reg, u8 val)
-{
-       return i2c_smbus_write_byte_data(tps->client, reg, val);
-}
-
-static int tps_65023_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)
-{
-       int err, data;
-
-       mutex_lock(&tps->io_lock);
-
-       data = tps_65023_read(tps, reg);
-       if (data < 0) {
-               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
-               err = data;
-               goto out;
-       }
-
-       data |= mask;
-       err = tps_65023_write(tps, reg, data);
-       if (err)
-               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
-
-out:
-       mutex_unlock(&tps->io_lock);
-       return err;
-}
-
-static int tps_65023_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)
-{
-       int err, data;
-
-       mutex_lock(&tps->io_lock);
-
-       data = tps_65023_read(tps, reg);
-       if (data < 0) {
-               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
-               err = data;
-               goto out;
-       }
-
-       data &= ~mask;
-
-       err = tps_65023_write(tps, reg, data);
-       if (err)
-               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
-
-out:
-       mutex_unlock(&tps->io_lock);
-       return err;
-
-}
-
-static int tps_65023_reg_read(struct tps_pmic *tps, u8 reg)
-{
-       int data;
-
-       mutex_lock(&tps->io_lock);
-
-       data = tps_65023_read(tps, reg);
-       if (data < 0)
-               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
-
-       mutex_unlock(&tps->io_lock);
-       return data;
-}
-
-static int tps_65023_reg_write(struct tps_pmic *tps, u8 reg, u8 val)
-{
-       int err;
-
-       mutex_lock(&tps->io_lock);
-
-       err = tps_65023_write(tps, reg, val);
-       if (err < 0)
-               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
-
-       mutex_unlock(&tps->io_lock);
-       return err;
-}
+/* Struct passed as driver data */
+struct tps_driver_data {
+       const struct tps_info *info;
+       u8 core_regulator;
+};
 
 static int tps65023_dcdc_is_enabled(struct regulator_dev *dev)
 {
        struct tps_pmic *tps = rdev_get_drvdata(dev);
        int data, dcdc = rdev_get_id(dev);
+       int ret;
        u8 shift;
 
        if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
                return -EINVAL;
 
        shift = TPS65023_NUM_REGULATOR - dcdc;
-       data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);
+       ret = regmap_read(tps->regmap, TPS65023_REG_REG_CTRL, &data);
 
-       if (data < 0)
-               return data;
+       if (ret != 0)
+               return ret;
        else
                return (data & 1<<shift) ? 1 : 0;
 }
@@ -236,16 +175,17 @@ static int tps65023_ldo_is_enabled(struct regulator_dev *dev)
 {
        struct tps_pmic *tps = rdev_get_drvdata(dev);
        int data, ldo = rdev_get_id(dev);
+       int ret;
        u8 shift;
 
        if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
                return -EINVAL;
 
        shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
-       data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);
+       ret = regmap_read(tps->regmap, TPS65023_REG_REG_CTRL, &data);
 
-       if (data < 0)
-               return data;
+       if (ret != 0)
+               return ret;
        else
                return (data & 1<<shift) ? 1 : 0;
 }
@@ -260,7 +200,7 @@ static int tps65023_dcdc_enable(struct regulator_dev *dev)
                return -EINVAL;
 
        shift = TPS65023_NUM_REGULATOR - dcdc;
-       return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+       return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 1 << shift);
 }
 
 static int tps65023_dcdc_disable(struct regulator_dev *dev)
@@ -273,7 +213,7 @@ static int tps65023_dcdc_disable(struct regulator_dev *dev)
                return -EINVAL;
 
        shift = TPS65023_NUM_REGULATOR - dcdc;
-       return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+       return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 0);
 }
 
 static int tps65023_ldo_enable(struct regulator_dev *dev)
@@ -286,7 +226,7 @@ static int tps65023_ldo_enable(struct regulator_dev *dev)
                return -EINVAL;
 
        shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
-       return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+       return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 1 << shift);
 }
 
 static int tps65023_ldo_disable(struct regulator_dev *dev)
@@ -299,21 +239,22 @@ static int tps65023_ldo_disable(struct regulator_dev *dev)
                return -EINVAL;
 
        shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
-       return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+       return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 0);
 }
 
 static int tps65023_dcdc_get_voltage(struct regulator_dev *dev)
 {
        struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int ret;
        int data, dcdc = rdev_get_id(dev);
 
        if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
                return -EINVAL;
 
-       if (dcdc == TPS65023_DCDC_1) {
-               data = tps_65023_reg_read(tps, TPS65023_REG_DEF_CORE);
-               if (data < 0)
-                       return data;
+       if (dcdc == tps->core_regulator) {
+               ret = regmap_read(tps->regmap, TPS65023_REG_DEF_CORE, &data);
+               if (ret != 0)
+                       return ret;
                data &= (tps->info[dcdc]->table_len - 1);
                return tps->info[dcdc]->table[data] * 1000;
        } else
@@ -321,15 +262,16 @@ static int tps65023_dcdc_get_voltage(struct regulator_dev *dev)
 }
 
 static int tps65023_dcdc_set_voltage(struct regulator_dev *dev,
-                               int min_uV, int max_uV)
+                                    int min_uV, int max_uV,
+                                    unsigned *selector)
 {
        struct tps_pmic *tps = rdev_get_drvdata(dev);
        int dcdc = rdev_get_id(dev);
        int vsel;
+       int ret;
 
-       if (dcdc != TPS65023_DCDC_1)
+       if (dcdc != tps->core_regulator)
                return -EINVAL;
-
        if (min_uV < tps->info[dcdc]->min_uV
                        || min_uV > tps->info[dcdc]->max_uV)
                return -EINVAL;
@@ -346,24 +288,37 @@ static int tps65023_dcdc_set_voltage(struct regulator_dev *dev,
                        break;
        }
 
-       /* write to the register in case we found a match */
+       *selector = vsel;
+
        if (vsel == tps->info[dcdc]->table_len)
-               return -EINVAL;
-       else
-               return tps_65023_reg_write(tps, TPS65023_REG_DEF_CORE, vsel);
+               goto failed;
+
+       ret = regmap_write(tps->regmap, TPS65023_REG_DEF_CORE, vsel);
+
+       /* Tell the chip that we have changed the value in DEFCORE
+        * and its time to update the core voltage
+        */
+       regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
+                       TPS65023_REG_CTRL2_GO, TPS65023_REG_CTRL2_GO);
+
+       return ret;
+
+failed:
+       return -EINVAL;
 }
 
 static int tps65023_ldo_get_voltage(struct regulator_dev *dev)
 {
        struct tps_pmic *tps = rdev_get_drvdata(dev);
        int data, ldo = rdev_get_id(dev);
+       int ret;
 
        if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
                return -EINVAL;
 
-       data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);
-       if (data < 0)
-               return data;
+       ret = regmap_read(tps->regmap, TPS65023_REG_LDO_CTRL, &data);
+       if (ret != 0)
+               return ret;
 
        data >>= (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1));
        data &= (tps->info[ldo]->table_len - 1);
@@ -371,10 +326,11 @@ static int tps65023_ldo_get_voltage(struct regulator_dev *dev)
 }
 
 static int tps65023_ldo_set_voltage(struct regulator_dev *dev,
-                               int min_uV, int max_uV)
+                                   int min_uV, int max_uV, unsigned *selector)
 {
        struct tps_pmic *tps = rdev_get_drvdata(dev);
        int data, vsel, ldo = rdev_get_id(dev);
+       int ret;
 
        if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
                return -EINVAL;
@@ -396,13 +352,15 @@ static int tps65023_ldo_set_voltage(struct regulator_dev *dev,
        if (vsel == tps->info[ldo]->table_len)
                return -EINVAL;
 
-       data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);
-       if (data < 0)
-               return data;
+       *selector = vsel;
+
+       ret = regmap_read(tps->regmap, TPS65023_REG_LDO_CTRL, &data);
+       if (ret != 0)
+               return ret;
 
        data &= TPS65023_LDO_CTRL_LDOx_MASK(ldo - TPS65023_LDO_1);
        data |= (vsel << (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1)));
-       return tps_65023_reg_write(tps, TPS65023_REG_LDO_CTRL, data);
+       return regmap_write(tps->regmap, TPS65023_REG_LDO_CTRL, data);
 }
 
 static int tps65023_dcdc_list_voltage(struct regulator_dev *dev,
@@ -414,7 +372,7 @@ static int tps65023_dcdc_list_voltage(struct regulator_dev *dev,
        if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
                return -EINVAL;
 
-       if (dcdc == TPS65023_DCDC_1) {
+       if (dcdc == tps->core_regulator) {
                if (selector >= tps->info[dcdc]->table_len)
                        return -EINVAL;
                else
@@ -458,11 +416,16 @@ static struct regulator_ops tps65023_ldo_ops = {
        .list_voltage = tps65023_ldo_list_voltage,
 };
 
+static struct regmap_config tps65023_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+};
+
 static int __devinit tps_65023_probe(struct i2c_client *client,
                                     const struct i2c_device_id *id)
 {
-       static int desc_id;
-       const struct tps_info *info = (void *)id->driver_data;
+       const struct tps_driver_data *drv_data = (void *)id->driver_data;
+       const struct tps_info *info = drv_data->info;
        struct regulator_init_data *init_data;
        struct regulator_dev *rdev;
        struct tps_pmic *tps;
@@ -484,18 +447,25 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
        if (!tps)
                return -ENOMEM;
 
-       mutex_init(&tps->io_lock);
+       tps->regmap = regmap_init_i2c(client, &tps65023_regmap_config);
+       if (IS_ERR(tps->regmap)) {
+               error = PTR_ERR(tps->regmap);
+               dev_err(&client->dev, "Failed to allocate register map: %d\n",
+                       error);
+               goto fail_alloc;
+       }
 
        /* common for all regulators */
        tps->client = client;
+       tps->core_regulator = drv_data->core_regulator;
 
        for (i = 0; i < TPS65023_NUM_REGULATOR; i++, info++, init_data++) {
                /* Store regulator specific information */
                tps->info[i] = info;
 
                tps->desc[i].name = info->name;
-               tps->desc[i].id = desc_id++;
-               tps->desc[i].n_voltages = num_voltages[i];
+               tps->desc[i].id = i;
+               tps->desc[i].n_voltages = info->table_len;
                tps->desc[i].ops = (i > TPS65023_DCDC_3 ?
                                        &tps65023_ldo_ops : &tps65023_dcdc_ops);
                tps->desc[i].type = REGULATOR_VOLTAGE;
@@ -503,7 +473,7 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
 
                /* Register the regulators */
                rdev = regulator_register(&tps->desc[i], &client->dev,
-                                         init_data, tps);
+                                         init_data, tps, NULL);
                if (IS_ERR(rdev)) {
                        dev_err(&client->dev, "failed to register %s\n",
                                id->name);
@@ -517,12 +487,18 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, tps);
 
+       /* Enable setting output voltage by I2C */
+       regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
+                       TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
+
        return 0;
 
  fail:
        while (--i >= 0)
                regulator_unregister(tps->rdev[i]);
 
+       regmap_exit(tps->regmap);
+ fail_alloc:
        kfree(tps);
        return error;
 }
@@ -541,18 +517,92 @@ static int __devexit tps_65023_remove(struct i2c_client *client)
        for (i = 0; i < TPS65023_NUM_REGULATOR; i++)
                regulator_unregister(tps->rdev[i]);
 
+       regmap_exit(tps->regmap);
        kfree(tps);
 
        return 0;
 }
 
+static const struct tps_info tps65020_regs[] = {
+       {
+               .name = "VDCDC1",
+               .min_uV = 3300000,
+               .max_uV = 3300000,
+               .fixed  = 1,
+       },
+       {
+               .name = "VDCDC2",
+               .min_uV =  1800000,
+               .max_uV = 1800000,
+               .fixed = 1,
+       },
+       {
+               .name = "VDCDC3",
+               .min_uV =  800000,
+               .max_uV = 1600000,
+               .table_len = ARRAY_SIZE(VCORE_VSEL_table),
+               .table = VCORE_VSEL_table,
+       },
+
+       {
+               .name = "LDO1",
+               .min_uV = 1000000,
+               .max_uV = 3150000,
+               .table_len = ARRAY_SIZE(TPS65020_LDO1_VSEL_table),
+               .table = TPS65020_LDO1_VSEL_table,
+       },
+       {
+               .name = "LDO2",
+               .min_uV = 1050000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(TPS65020_LDO2_VSEL_table),
+               .table = TPS65020_LDO2_VSEL_table,
+       },
+};
+
+static const struct tps_info tps65021_regs[] = {
+       {
+               .name = "VDCDC1",
+               .min_uV =  3300000,
+               .max_uV = 3300000,
+               .fixed = 1,
+       },
+       {
+               .name = "VDCDC2",
+               .min_uV =  1800000,
+               .max_uV = 1800000,
+               .fixed = 1,
+       },
+       {
+               .name = "VDCDC3",
+               .min_uV =  800000,
+               .max_uV = 1600000,
+               .table_len = ARRAY_SIZE(VCORE_VSEL_table),
+               .table = VCORE_VSEL_table,
+       },
+       {
+               .name = "LDO1",
+               .min_uV = 1000000,
+               .max_uV = 3150000,
+               .table_len = ARRAY_SIZE(TPS65023_LDO1_VSEL_table),
+               .table = TPS65023_LDO1_VSEL_table,
+       },
+       {
+               .name = "LDO2",
+               .min_uV = 1050000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(TPS65023_LDO2_VSEL_table),
+               .table = TPS65023_LDO2_VSEL_table,
+       },
+};
+
 static const struct tps_info tps65023_regs[] = {
        {
                .name = "VDCDC1",
                .min_uV =  800000,
                .max_uV = 1600000,
-               .table_len = ARRAY_SIZE(VDCDC1_VSEL_table),
-               .table = VDCDC1_VSEL_table,
+               .table_len = ARRAY_SIZE(VCORE_VSEL_table),
+               .table = VCORE_VSEL_table,
        },
        {
                .name = "VDCDC2",
@@ -570,23 +620,40 @@ static const struct tps_info tps65023_regs[] = {
                .name = "LDO1",
                .min_uV = 1000000,
                .max_uV = 3150000,
-               .table_len = ARRAY_SIZE(LDO1_VSEL_table),
-               .table = LDO1_VSEL_table,
+               .table_len = ARRAY_SIZE(TPS65023_LDO1_VSEL_table),
+               .table = TPS65023_LDO1_VSEL_table,
        },
        {
                .name = "LDO2",
                .min_uV = 1050000,
                .max_uV = 3300000,
-               .table_len = ARRAY_SIZE(LDO2_VSEL_table),
-               .table = LDO2_VSEL_table,
+               .table_len = ARRAY_SIZE(TPS65023_LDO2_VSEL_table),
+               .table = TPS65023_LDO2_VSEL_table,
        },
 };
 
+static struct tps_driver_data tps65020_drv_data = {
+       .info = tps65020_regs,
+       .core_regulator = TPS65023_DCDC_3,
+};
+
+static struct tps_driver_data tps65021_drv_data = {
+               .info = tps65021_regs,
+               .core_regulator = TPS65023_DCDC_3,
+};
+
+static struct tps_driver_data tps65023_drv_data = {
+               .info = tps65023_regs,
+               .core_regulator = TPS65023_DCDC_1,
+};
+
 static const struct i2c_device_id tps_65023_id[] = {
        {.name = "tps65023",
-       .driver_data = (unsigned long) tps65023_regs,},
+       .driver_data = (unsigned long) &tps65023_drv_data},
        {.name = "tps65021",
-       .driver_data = (unsigned long) tps65023_regs,},
+       .driver_data = (unsigned long) &tps65021_drv_data,},
+       {.name = "tps65020",
+       .driver_data = (unsigned long) &tps65020_drv_data},
        { },
 };