regulator: regulator driver for Palmas series chips
[linux-2.6.git] / drivers / regulator / tps6507x-regulator.c
index 23c0597..832833f 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/i2c.h>
+#include <linux/regulator/tps6507x.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mfd/tps6507x.h>
@@ -90,141 +90,165 @@ static const u16 LDO2_VSEL_table[] = {
        3000, 3100, 3200, 3300,
 };
 
-static unsigned int num_voltages[] = {ARRAY_SIZE(VDCDCx_VSEL_table),
-                               ARRAY_SIZE(VDCDCx_VSEL_table),
-                               ARRAY_SIZE(VDCDCx_VSEL_table),
-                               ARRAY_SIZE(LDO1_VSEL_table),
-                               ARRAY_SIZE(LDO2_VSEL_table)};
-
 struct tps_info {
        const char *name;
        unsigned min_uV;
        unsigned max_uV;
        u8 table_len;
        const u16 *table;
+
+       /* Does DCDC high or the low register defines output voltage? */
+       bool defdcdc_default;
+};
+
+static struct tps_info tps6507x_pmic_regs[] = {
+       {
+               .name = "VDCDC1",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
+               .table = VDCDCx_VSEL_table,
+       },
+       {
+               .name = "VDCDC2",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
+               .table = VDCDCx_VSEL_table,
+       },
+       {
+               .name = "VDCDC3",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
+               .table = VDCDCx_VSEL_table,
+       },
+       {
+               .name = "LDO1",
+               .min_uV = 1000000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(LDO1_VSEL_table),
+               .table = LDO1_VSEL_table,
+       },
+       {
+               .name = "LDO2",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(LDO2_VSEL_table),
+               .table = LDO2_VSEL_table,
+       },
 };
 
-struct tps_pmic {
+struct tps6507x_pmic {
        struct regulator_desc desc[TPS6507X_NUM_REGULATOR];
-       struct i2c_client *client;
+       struct tps6507x_dev *mfd;
        struct regulator_dev *rdev[TPS6507X_NUM_REGULATOR];
-       const struct tps_info *info[TPS6507X_NUM_REGULATOR];
+       struct tps_info *info[TPS6507X_NUM_REGULATOR];
        struct mutex io_lock;
 };
-
-static inline int tps_6507x_read(struct tps_pmic *tps, u8 reg)
+static inline int tps6507x_pmic_read(struct tps6507x_pmic *tps, u8 reg)
 {
-       return i2c_smbus_read_byte_data(tps->client, reg);
+       u8 val;
+       int err;
+
+       err = tps->mfd->read_dev(tps->mfd, reg, 1, &val);
+
+       if (err)
+               return err;
+
+       return val;
 }
 
-static inline int tps_6507x_write(struct tps_pmic *tps, u8 reg, u8 val)
+static inline int tps6507x_pmic_write(struct tps6507x_pmic *tps, u8 reg, u8 val)
 {
-       return i2c_smbus_write_byte_data(tps->client, reg, val);
+       return tps->mfd->write_dev(tps->mfd, reg, 1, &val);
 }
 
-static int tps_6507x_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)
+static int tps6507x_pmic_set_bits(struct tps6507x_pmic *tps, u8 reg, u8 mask)
 {
        int err, data;
 
        mutex_lock(&tps->io_lock);
 
-       data = tps_6507x_read(tps, reg);
+       data = tps6507x_pmic_read(tps, reg);
        if (data < 0) {
-               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+               dev_err(tps->mfd->dev, "Read from reg 0x%x failed\n", reg);
                err = data;
                goto out;
        }
 
        data |= mask;
-       err = tps_6507x_write(tps, reg, data);
+       err = tps6507x_pmic_write(tps, reg, data);
        if (err)
-               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+               dev_err(tps->mfd->dev, "Write for reg 0x%x failed\n", reg);
 
 out:
        mutex_unlock(&tps->io_lock);
        return err;
 }
 
-static int tps_6507x_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)
+static int tps6507x_pmic_clear_bits(struct tps6507x_pmic *tps, u8 reg, u8 mask)
 {
        int err, data;
 
        mutex_lock(&tps->io_lock);
 
-       data = tps_6507x_read(tps, reg);
+       data = tps6507x_pmic_read(tps, reg);
        if (data < 0) {
-               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+               dev_err(tps->mfd->dev, "Read from reg 0x%x failed\n", reg);
                err = data;
                goto out;
        }
 
        data &= ~mask;
-       err = tps_6507x_write(tps, reg, data);
+       err = tps6507x_pmic_write(tps, reg, data);
        if (err)
-               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+               dev_err(tps->mfd->dev, "Write for reg 0x%x failed\n", reg);
 
 out:
        mutex_unlock(&tps->io_lock);
        return err;
 }
 
-static int tps_6507x_reg_read(struct tps_pmic *tps, u8 reg)
+static int tps6507x_pmic_reg_read(struct tps6507x_pmic *tps, u8 reg)
 {
        int data;
 
        mutex_lock(&tps->io_lock);
 
-       data = tps_6507x_read(tps, reg);
+       data = tps6507x_pmic_read(tps, reg);
        if (data < 0)
-               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+               dev_err(tps->mfd->dev, "Read from reg 0x%x failed\n", reg);
 
        mutex_unlock(&tps->io_lock);
        return data;
 }
 
-static int tps_6507x_reg_write(struct tps_pmic *tps, u8 reg, u8 val)
+static int tps6507x_pmic_reg_write(struct tps6507x_pmic *tps, u8 reg, u8 val)
 {
        int err;
 
        mutex_lock(&tps->io_lock);
 
-       err = tps_6507x_write(tps, reg, val);
+       err = tps6507x_pmic_write(tps, reg, val);
        if (err < 0)
-               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+               dev_err(tps->mfd->dev, "Write for reg 0x%x failed\n", reg);
 
        mutex_unlock(&tps->io_lock);
        return err;
 }
 
-static int tps6507x_dcdc_is_enabled(struct regulator_dev *dev)
-{
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int data, dcdc = rdev_get_id(dev);
-       u8 shift;
-
-       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
-               return -EINVAL;
-
-       shift = TPS6507X_MAX_REG_ID - dcdc;
-       data = tps_6507x_reg_read(tps, TPS6507X_REG_CON_CTRL1);
-
-       if (data < 0)
-               return data;
-       else
-               return (data & 1<<shift) ? 1 : 0;
-}
-
-static int tps6507x_ldo_is_enabled(struct regulator_dev *dev)
+static int tps6507x_pmic_is_enabled(struct regulator_dev *dev)
 {
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int data, ldo = rdev_get_id(dev);
+       struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
+       int data, rid = rdev_get_id(dev);
        u8 shift;
 
-       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+       if (rid < TPS6507X_DCDC_1 || rid > TPS6507X_LDO_2)
                return -EINVAL;
 
-       shift = TPS6507X_MAX_REG_ID - ldo;
-       data = tps_6507x_reg_read(tps, TPS6507X_REG_CON_CTRL1);
+       shift = TPS6507X_MAX_REG_ID - rid;
+       data = tps6507x_pmic_reg_read(tps, TPS6507X_REG_CON_CTRL1);
 
        if (data < 0)
                return data;
@@ -232,277 +256,177 @@ static int tps6507x_ldo_is_enabled(struct regulator_dev *dev)
                return (data & 1<<shift) ? 1 : 0;
 }
 
-static int tps6507x_dcdc_enable(struct regulator_dev *dev)
-{
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int dcdc = rdev_get_id(dev);
-       u8 shift;
-
-       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
-               return -EINVAL;
-
-       shift = TPS6507X_MAX_REG_ID - dcdc;
-       return tps_6507x_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
-}
-
-static int tps6507x_dcdc_disable(struct regulator_dev *dev)
-{
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int dcdc = rdev_get_id(dev);
-       u8 shift;
-
-       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
-               return -EINVAL;
-
-       shift = TPS6507X_MAX_REG_ID - dcdc;
-       return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
-}
-
-static int tps6507x_ldo_enable(struct regulator_dev *dev)
+static int tps6507x_pmic_enable(struct regulator_dev *dev)
 {
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int ldo = rdev_get_id(dev);
+       struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
+       int rid = rdev_get_id(dev);
        u8 shift;
 
-       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+       if (rid < TPS6507X_DCDC_1 || rid > TPS6507X_LDO_2)
                return -EINVAL;
 
-       shift = TPS6507X_MAX_REG_ID - ldo;
-       return tps_6507x_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
+       shift = TPS6507X_MAX_REG_ID - rid;
+       return tps6507x_pmic_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
 }
 
-static int tps6507x_ldo_disable(struct regulator_dev *dev)
+static int tps6507x_pmic_disable(struct regulator_dev *dev)
 {
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int ldo = rdev_get_id(dev);
+       struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
+       int rid = rdev_get_id(dev);
        u8 shift;
 
-       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+       if (rid < TPS6507X_DCDC_1 || rid > TPS6507X_LDO_2)
                return -EINVAL;
 
-       shift = TPS6507X_MAX_REG_ID - ldo;
-       return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
+       shift = TPS6507X_MAX_REG_ID - rid;
+       return tps6507x_pmic_clear_bits(tps, TPS6507X_REG_CON_CTRL1,
+                                       1 << shift);
 }
 
-static int tps6507x_dcdc_get_voltage(struct regulator_dev *dev)
+static int tps6507x_pmic_get_voltage(struct regulator_dev *dev)
 {
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int data, dcdc = rdev_get_id(dev);
-       u8 reg;
+       struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
+       int data, rid = rdev_get_id(dev);
+       u8 reg, mask;
 
-       switch (dcdc) {
+       switch (rid) {
        case TPS6507X_DCDC_1:
                reg = TPS6507X_REG_DEFDCDC1;
+               mask = TPS6507X_DEFDCDCX_DCDC_MASK;
                break;
        case TPS6507X_DCDC_2:
-               reg = TPS6507X_REG_DEFDCDC2_LOW;
+               if (tps->info[rid]->defdcdc_default)
+                       reg = TPS6507X_REG_DEFDCDC2_HIGH;
+               else
+                       reg = TPS6507X_REG_DEFDCDC2_LOW;
+               mask = TPS6507X_DEFDCDCX_DCDC_MASK;
                break;
        case TPS6507X_DCDC_3:
-               reg = TPS6507X_REG_DEFDCDC3_LOW;
+               if (tps->info[rid]->defdcdc_default)
+                       reg = TPS6507X_REG_DEFDCDC3_HIGH;
+               else
+                       reg = TPS6507X_REG_DEFDCDC3_LOW;
+               mask = TPS6507X_DEFDCDCX_DCDC_MASK;
+               break;
+       case TPS6507X_LDO_1:
+               reg = TPS6507X_REG_LDO_CTRL1;
+               mask = TPS6507X_REG_LDO_CTRL1_LDO1_MASK;
+               break;
+       case TPS6507X_LDO_2:
+               reg = TPS6507X_REG_DEFLDO2;
+               mask = TPS6507X_REG_DEFLDO2_LDO2_MASK;
                break;
        default:
                return -EINVAL;
        }
 
-       data = tps_6507x_reg_read(tps, reg);
+       data = tps6507x_pmic_reg_read(tps, reg);
        if (data < 0)
                return data;
 
-       data &= TPS6507X_DEFDCDCX_DCDC_MASK;
-       return tps->info[dcdc]->table[data] * 1000;
+       data &= mask;
+       return tps->info[rid]->table[data] * 1000;
 }
 
-static int tps6507x_dcdc_set_voltage(struct regulator_dev *dev,
-                               int min_uV, int max_uV)
+static int tps6507x_pmic_set_voltage_sel(struct regulator_dev *dev,
+                                         unsigned selector)
 {
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int data, vsel, dcdc = rdev_get_id(dev);
-       u8 reg;
+       struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
+       int data, rid = rdev_get_id(dev);
+       u8 reg, mask;
 
-       switch (dcdc) {
+       switch (rid) {
        case TPS6507X_DCDC_1:
                reg = TPS6507X_REG_DEFDCDC1;
+               mask = TPS6507X_DEFDCDCX_DCDC_MASK;
                break;
        case TPS6507X_DCDC_2:
-               reg = TPS6507X_REG_DEFDCDC2_LOW;
+               if (tps->info[rid]->defdcdc_default)
+                       reg = TPS6507X_REG_DEFDCDC2_HIGH;
+               else
+                       reg = TPS6507X_REG_DEFDCDC2_LOW;
+               mask = TPS6507X_DEFDCDCX_DCDC_MASK;
                break;
        case TPS6507X_DCDC_3:
-               reg = TPS6507X_REG_DEFDCDC3_LOW;
+               if (tps->info[rid]->defdcdc_default)
+                       reg = TPS6507X_REG_DEFDCDC3_HIGH;
+               else
+                       reg = TPS6507X_REG_DEFDCDC3_LOW;
+               mask = TPS6507X_DEFDCDCX_DCDC_MASK;
+               break;
+       case TPS6507X_LDO_1:
+               reg = TPS6507X_REG_LDO_CTRL1;
+               mask = TPS6507X_REG_LDO_CTRL1_LDO1_MASK;
+               break;
+       case TPS6507X_LDO_2:
+               reg = TPS6507X_REG_DEFLDO2;
+               mask = TPS6507X_REG_DEFLDO2_LDO2_MASK;
                break;
        default:
                return -EINVAL;
        }
 
-       if (min_uV < tps->info[dcdc]->min_uV
-               || min_uV > tps->info[dcdc]->max_uV)
-               return -EINVAL;
-       if (max_uV < tps->info[dcdc]->min_uV
-               || max_uV > tps->info[dcdc]->max_uV)
-               return -EINVAL;
-
-       for (vsel = 0; vsel < tps->info[dcdc]->table_len; vsel++) {
-               int mV = tps->info[dcdc]->table[vsel];
-               int uV = mV * 1000;
-
-               /* Break at the first in-range value */
-               if (min_uV <= uV && uV <= max_uV)
-                       break;
-       }
-
-       /* write to the register in case we found a match */
-       if (vsel == tps->info[dcdc]->table_len)
-               return -EINVAL;
-
-       data = tps_6507x_reg_read(tps, reg);
-       if (data < 0)
-               return data;
-
-       data &= ~TPS6507X_DEFDCDCX_DCDC_MASK;
-       data |= vsel;
-
-       return tps_6507x_reg_write(tps, reg, data);
-}
-
-static int tps6507x_ldo_get_voltage(struct regulator_dev *dev)
-{
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int data, ldo = rdev_get_id(dev);
-       u8 reg, mask;
-
-       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
-               return -EINVAL;
-       else {
-               reg = (ldo == TPS6507X_LDO_1 ?
-                       TPS6507X_REG_LDO_CTRL1 : TPS6507X_REG_DEFLDO2);
-               mask = (ldo == TPS6507X_LDO_1 ?
-                       TPS6507X_REG_LDO_CTRL1_LDO1_MASK :
-                               TPS6507X_REG_DEFLDO2_LDO2_MASK);
-       }
-
-       data = tps_6507x_reg_read(tps, reg);
-       if (data < 0)
-               return data;
-
-       data &= mask;
-       return tps->info[ldo]->table[data] * 1000;
-}
-
-static int tps6507x_ldo_set_voltage(struct regulator_dev *dev,
-                               int min_uV, int max_uV)
-{
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int data, vsel, ldo = rdev_get_id(dev);
-       u8 reg, mask;
-
-       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
-               return -EINVAL;
-       else {
-               reg = (ldo == TPS6507X_LDO_1 ?
-                       TPS6507X_REG_LDO_CTRL1 : TPS6507X_REG_DEFLDO2);
-               mask = (ldo == TPS6507X_LDO_1 ?
-                       TPS6507X_REG_LDO_CTRL1_LDO1_MASK :
-                               TPS6507X_REG_DEFLDO2_LDO2_MASK);
-       }
-
-       if (min_uV < tps->info[ldo]->min_uV || min_uV > tps->info[ldo]->max_uV)
-               return -EINVAL;
-       if (max_uV < tps->info[ldo]->min_uV || max_uV > tps->info[ldo]->max_uV)
-               return -EINVAL;
-
-       for (vsel = 0; vsel < tps->info[ldo]->table_len; vsel++) {
-               int mV = tps->info[ldo]->table[vsel];
-               int uV = mV * 1000;
-
-               /* Break at the first in-range value */
-               if (min_uV <= uV && uV <= max_uV)
-                       break;
-       }
-
-       if (vsel == tps->info[ldo]->table_len)
-               return -EINVAL;
-
-       data = tps_6507x_reg_read(tps, reg);
+       data = tps6507x_pmic_reg_read(tps, reg);
        if (data < 0)
                return data;
 
        data &= ~mask;
-       data |= vsel;
-
-       return tps_6507x_reg_write(tps, reg, data);
-}
-
-static int tps6507x_dcdc_list_voltage(struct regulator_dev *dev,
-                                       unsigned selector)
-{
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int dcdc = rdev_get_id(dev);
-
-       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
-               return -EINVAL;
+       data |= selector;
 
-       if (selector >= tps->info[dcdc]->table_len)
-               return -EINVAL;
-       else
-               return tps->info[dcdc]->table[selector] * 1000;
+       return tps6507x_pmic_reg_write(tps, reg, data);
 }
 
-static int tps6507x_ldo_list_voltage(struct regulator_dev *dev,
+static int tps6507x_pmic_list_voltage(struct regulator_dev *dev,
                                        unsigned selector)
 {
-       struct tps_pmic *tps = rdev_get_drvdata(dev);
-       int ldo = rdev_get_id(dev);
+       struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
+       int rid = rdev_get_id(dev);
 
-       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+       if (rid < TPS6507X_DCDC_1 || rid > TPS6507X_LDO_2)
                return -EINVAL;
 
-       if (selector >= tps->info[ldo]->table_len)
+       if (selector >= tps->info[rid]->table_len)
                return -EINVAL;
        else
-               return tps->info[ldo]->table[selector] * 1000;
+               return tps->info[rid]->table[selector] * 1000;
 }
 
-/* Operations permitted on VDCDCx */
-static struct regulator_ops tps6507x_dcdc_ops = {
-       .is_enabled = tps6507x_dcdc_is_enabled,
-       .enable = tps6507x_dcdc_enable,
-       .disable = tps6507x_dcdc_disable,
-       .get_voltage = tps6507x_dcdc_get_voltage,
-       .set_voltage = tps6507x_dcdc_set_voltage,
-       .list_voltage = tps6507x_dcdc_list_voltage,
+static struct regulator_ops tps6507x_pmic_ops = {
+       .is_enabled = tps6507x_pmic_is_enabled,
+       .enable = tps6507x_pmic_enable,
+       .disable = tps6507x_pmic_disable,
+       .get_voltage = tps6507x_pmic_get_voltage,
+       .set_voltage_sel = tps6507x_pmic_set_voltage_sel,
+       .list_voltage = tps6507x_pmic_list_voltage,
 };
 
-/* Operations permitted on LDOx */
-static struct regulator_ops tps6507x_ldo_ops = {
-       .is_enabled = tps6507x_ldo_is_enabled,
-       .enable = tps6507x_ldo_enable,
-       .disable = tps6507x_ldo_disable,
-       .get_voltage = tps6507x_ldo_get_voltage,
-       .set_voltage = tps6507x_ldo_set_voltage,
-       .list_voltage = tps6507x_ldo_list_voltage,
-};
-
-static int __devinit tps_6507x_probe(struct i2c_client *client,
-                                    const struct i2c_device_id *id)
+static __devinit int tps6507x_pmic_probe(struct platform_device *pdev)
 {
-       static int desc_id;
-       const struct tps_info *info = (void *)id->driver_data;
+       struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev->dev.parent);
+       struct tps_info *info = &tps6507x_pmic_regs[0];
        struct regulator_init_data *init_data;
        struct regulator_dev *rdev;
-       struct tps_pmic *tps;
+       struct tps6507x_pmic *tps;
+       struct tps6507x_board *tps_board;
        int i;
        int error;
 
-       if (!i2c_check_functionality(client->adapter,
-                               I2C_FUNC_SMBUS_BYTE_DATA))
-               return -EIO;
+       /**
+        * tps_board points to pmic related constants
+        * coming from the board-evm file.
+        */
+
+       tps_board = dev_get_platdata(tps6507x_dev->dev);
+       if (!tps_board)
+               return -EINVAL;
 
        /**
         * init_data points to array of regulator_init structures
         * coming from the board-evm file.
         */
-       init_data = client->dev.platform_data;
+       init_data = tps_board->tps6507x_pmic_init_data;
        if (!init_data)
-               return -EIO;
+               return -EINVAL;
 
        tps = kzalloc(sizeof(*tps), GFP_KERNEL);
        if (!tps)
@@ -511,24 +435,30 @@ static int __devinit tps_6507x_probe(struct i2c_client *client,
        mutex_init(&tps->io_lock);
 
        /* common for all regulators */
-       tps->client = client;
+       tps->mfd = tps6507x_dev;
 
        for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {
                /* Register the regulators */
                tps->info[i] = info;
+               if (init_data->driver_data) {
+                       struct tps6507x_reg_platform_data *data =
+                                                       init_data->driver_data;
+                       tps->info[i]->defdcdc_default = data->defdcdc_default;
+               }
+
                tps->desc[i].name = info->name;
-               tps->desc[i].id = desc_id++;
-               tps->desc[i].n_voltages = num_voltages[i];
-               tps->desc[i].ops = (i > TPS6507X_DCDC_3 ?
-                               &tps6507x_ldo_ops : &tps6507x_dcdc_ops);
+               tps->desc[i].id = i;
+               tps->desc[i].n_voltages = info->table_len;
+               tps->desc[i].ops = &tps6507x_pmic_ops;
                tps->desc[i].type = REGULATOR_VOLTAGE;
                tps->desc[i].owner = THIS_MODULE;
 
                rdev = regulator_register(&tps->desc[i],
-                                       &client->dev, init_data, tps);
+                                       tps6507x_dev->dev, init_data, tps, NULL);
                if (IS_ERR(rdev)) {
-                       dev_err(&client->dev, "failed to register %s\n",
-                               id->name);
+                       dev_err(tps6507x_dev->dev,
+                               "failed to register %s regulator\n",
+                               pdev->name);
                        error = PTR_ERR(rdev);
                        goto fail;
                }
@@ -537,7 +467,8 @@ static int __devinit tps_6507x_probe(struct i2c_client *client,
                tps->rdev[i] = rdev;
        }
 
-       i2c_set_clientdata(client, tps);
+       tps6507x_dev->pmic = tps;
+       platform_set_drvdata(pdev, tps6507x_dev);
 
        return 0;
 
@@ -549,20 +480,12 @@ fail:
        return error;
 }
 
-/**
- * tps_6507x_remove - TPS6507x driver i2c remove handler
- * @client: i2c driver client device structure
- *
- * Unregister TPS driver as an i2c client device driver
- */
-static int __devexit tps_6507x_remove(struct i2c_client *client)
+static int __devexit tps6507x_pmic_remove(struct platform_device *pdev)
 {
-       struct tps_pmic *tps = i2c_get_clientdata(client);
+       struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
+       struct tps6507x_pmic *tps = tps6507x_dev->pmic;
        int i;
 
-       /* clear the client data in i2c */
-       i2c_set_clientdata(client, NULL);
-
        for (i = 0; i < TPS6507X_NUM_REGULATOR; i++)
                regulator_unregister(tps->rdev[i]);
 
@@ -571,83 +494,28 @@ static int __devexit tps_6507x_remove(struct i2c_client *client)
        return 0;
 }
 
-static const struct tps_info tps6507x_regs[] = {
-       {
-               .name = "VDCDC1",
-               .min_uV = 725000,
-               .max_uV = 3300000,
-               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
-               .table = VDCDCx_VSEL_table,
-       },
-       {
-               .name = "VDCDC2",
-               .min_uV = 725000,
-               .max_uV = 3300000,
-               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
-               .table = VDCDCx_VSEL_table,
-       },
-       {
-               .name = "VDCDC3",
-               .min_uV = 725000,
-               .max_uV = 3300000,
-               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
-               .table = VDCDCx_VSEL_table,
-       },
-       {
-               .name = "LDO1",
-               .min_uV = 1000000,
-               .max_uV = 3300000,
-               .table_len = ARRAY_SIZE(LDO1_VSEL_table),
-               .table = LDO1_VSEL_table,
-       },
-       {
-               .name = "LDO2",
-               .min_uV = 725000,
-               .max_uV = 3300000,
-               .table_len = ARRAY_SIZE(LDO2_VSEL_table),
-               .table = LDO2_VSEL_table,
-       },
-};
-
-static const struct i2c_device_id tps_6507x_id[] = {
-       {.name = "tps6507x",
-       .driver_data = (unsigned long) tps6507x_regs,},
-       { },
-};
-MODULE_DEVICE_TABLE(i2c, tps_6507x_id);
-
-static struct i2c_driver tps_6507x_i2c_driver = {
+static struct platform_driver tps6507x_pmic_driver = {
        .driver = {
-               .name = "tps6507x",
+               .name = "tps6507x-pmic",
                .owner = THIS_MODULE,
        },
-       .probe = tps_6507x_probe,
-       .remove = __devexit_p(tps_6507x_remove),
-       .id_table = tps_6507x_id,
+       .probe = tps6507x_pmic_probe,
+       .remove = __devexit_p(tps6507x_pmic_remove),
 };
 
-/**
- * tps_6507x_init
- *
- * Module init function
- */
-static int __init tps_6507x_init(void)
+static int __init tps6507x_pmic_init(void)
 {
-       return i2c_add_driver(&tps_6507x_i2c_driver);
+       return platform_driver_register(&tps6507x_pmic_driver);
 }
-subsys_initcall(tps_6507x_init);
+subsys_initcall(tps6507x_pmic_init);
 
-/**
- * tps_6507x_cleanup
- *
- * Module exit function
- */
-static void __exit tps_6507x_cleanup(void)
+static void __exit tps6507x_pmic_cleanup(void)
 {
-       i2c_del_driver(&tps_6507x_i2c_driver);
+       platform_driver_unregister(&tps6507x_pmic_driver);
 }
-module_exit(tps_6507x_cleanup);
+module_exit(tps6507x_pmic_cleanup);
 
 MODULE_AUTHOR("Texas Instruments");
 MODULE_DESCRIPTION("TPS6507x voltage regulator driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:tps6507x-pmic");