Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

[~andy/linux] / drivers / regulator / tps65910-regulator.c

diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 4a37c2b6367fa3c6b8d926205e7719f4e4b5c4c9..5ee7e4bd8b5816b0597b4686a9bf07321ccffd97 100644 (file)
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -20,7 +20,6 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/mfd/tps65910.h>
@@ -467,48 +466,6 @@ static int tps65911_get_ctrl_register(int id)
        }
 }
 
-static int tps65910_is_enabled(struct regulator_dev *dev)
-{
-       struct tps65910_reg *pmic = rdev_get_drvdata(dev);
-       int reg, value, id = rdev_get_id(dev);
-
-       reg = pmic->get_ctrl_reg(id);
-       if (reg < 0)
-               return reg;
-
-       value = tps65910_reg_read(pmic, reg);
-       if (value < 0)
-               return value;
-
-       return value & TPS65910_SUPPLY_STATE_ENABLED;
-}
-
-static int tps65910_enable(struct regulator_dev *dev)
-{
-       struct tps65910_reg *pmic = rdev_get_drvdata(dev);
-       struct tps65910 *mfd = pmic->mfd;
-       int reg, id = rdev_get_id(dev);
-
-       reg = pmic->get_ctrl_reg(id);
-       if (reg < 0)
-               return reg;
-
-       return tps65910_set_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
-}
-
-static int tps65910_disable(struct regulator_dev *dev)
-{
-       struct tps65910_reg *pmic = rdev_get_drvdata(dev);
-       struct tps65910 *mfd = pmic->mfd;
-       int reg, id = rdev_get_id(dev);
-
-       reg = pmic->get_ctrl_reg(id);
-       if (reg < 0)
-               return reg;
-
-       return tps65910_clear_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
-}
-
 static int tps65910_enable_time(struct regulator_dev *dev)
 {
        struct tps65910_reg *pmic = rdev_get_drvdata(dev);
@@ -621,10 +578,10 @@ static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev)
        return -EINVAL;
 }
 
-static int tps65910_get_voltage(struct regulator_dev *dev)
+static int tps65910_get_voltage_sel(struct regulator_dev *dev)
 {
        struct tps65910_reg *pmic = rdev_get_drvdata(dev);
-       int reg, value, id = rdev_get_id(dev), voltage = 0;
+       int reg, value, id = rdev_get_id(dev);
 
        reg = pmic->get_ctrl_reg(id);
        if (reg < 0)
@@ -651,9 +608,7 @@ static int tps65910_get_voltage(struct regulator_dev *dev)
                return -EINVAL;
        }
 
-       voltage = pmic->info[id]->voltage_table[value] * 1000;
-
-       return voltage;
+       return value;
 }
 
 static int tps65910_get_voltage_vdd3(struct regulator_dev *dev)
@@ -661,10 +616,10 @@ static int tps65910_get_voltage_vdd3(struct regulator_dev *dev)
        return 5 * 1000 * 1000;
 }
 
-static int tps65911_get_voltage(struct regulator_dev *dev)
+static int tps65911_get_voltage_sel(struct regulator_dev *dev)
 {
        struct tps65910_reg *pmic = rdev_get_drvdata(dev);
-       int step_mv, id = rdev_get_id(dev);
+       int id = rdev_get_id(dev);
        u8 value, reg;
 
        reg = pmic->get_ctrl_reg(id);
@@ -677,13 +632,6 @@ static int tps65911_get_voltage(struct regulator_dev *dev)
        case TPS65911_REG_LDO4:
                value &= LDO1_SEL_MASK;
                value >>= LDO_SEL_SHIFT;
-               /* The first 5 values of the selector correspond to 1V */
-               if (value < 5)
-                       value = 0;
-               else
-                       value -= 4;
-
-               step_mv = 50;
                break;
        case TPS65911_REG_LDO3:
        case TPS65911_REG_LDO5:
@@ -692,23 +640,16 @@ static int tps65911_get_voltage(struct regulator_dev *dev)
        case TPS65911_REG_LDO8:
                value &= LDO3_SEL_MASK;
                value >>= LDO_SEL_SHIFT;
-               /* The first 3 values of the selector correspond to 1V */
-               if (value < 3)
-                       value = 0;
-               else
-                       value -= 2;
-
-               step_mv = 100;
                break;
        case TPS65910_REG_VIO:
                value &= LDO_SEL_MASK;
                value >>= LDO_SEL_SHIFT;
-               return pmic->info[id]->voltage_table[value] * 1000;
+               break;
        default:
                return -EINVAL;
        }
 
-       return (LDO_MIN_VOLT + value * step_mv) * 1000;
+       return value;
 }
 
 static int tps65910_set_voltage_dcdc_sel(struct regulator_dev *dev,
@@ -914,9 +855,9 @@ static int tps65910_set_voltage_dcdc_time_sel(struct regulator_dev *dev,
 
 /* Regulator ops (except VRTC) */
 static struct regulator_ops tps65910_ops_dcdc = {
-       .is_enabled             = tps65910_is_enabled,
-       .enable                 = tps65910_enable,
-       .disable                = tps65910_disable,
+       .is_enabled             = regulator_is_enabled_regmap,
+       .enable                 = regulator_enable_regmap,
+       .disable                = regulator_disable_regmap,
        .enable_time            = tps65910_enable_time,
        .set_mode               = tps65910_set_mode,
        .get_mode               = tps65910_get_mode,
@@ -927,9 +868,9 @@ static struct regulator_ops tps65910_ops_dcdc = {
 };
 
 static struct regulator_ops tps65910_ops_vdd3 = {
-       .is_enabled             = tps65910_is_enabled,
-       .enable                 = tps65910_enable,
-       .disable                = tps65910_disable,
+       .is_enabled             = regulator_is_enabled_regmap,
+       .enable                 = regulator_enable_regmap,
+       .disable                = regulator_disable_regmap,
        .enable_time            = tps65910_enable_time,
        .set_mode               = tps65910_set_mode,
        .get_mode               = tps65910_get_mode,
@@ -938,25 +879,25 @@ static struct regulator_ops tps65910_ops_vdd3 = {
 };
 
 static struct regulator_ops tps65910_ops = {
-       .is_enabled             = tps65910_is_enabled,
-       .enable                 = tps65910_enable,
-       .disable                = tps65910_disable,
+       .is_enabled             = regulator_is_enabled_regmap,
+       .enable                 = regulator_enable_regmap,
+       .disable                = regulator_disable_regmap,
        .enable_time            = tps65910_enable_time,
        .set_mode               = tps65910_set_mode,
        .get_mode               = tps65910_get_mode,
-       .get_voltage            = tps65910_get_voltage,
+       .get_voltage_sel        = tps65910_get_voltage_sel,
        .set_voltage_sel        = tps65910_set_voltage_sel,
        .list_voltage           = tps65910_list_voltage,
 };
 
 static struct regulator_ops tps65911_ops = {
-       .is_enabled             = tps65910_is_enabled,
-       .enable                 = tps65910_enable,
-       .disable                = tps65910_disable,
+       .is_enabled             = regulator_is_enabled_regmap,
+       .enable                 = regulator_enable_regmap,
+       .disable                = regulator_disable_regmap,
        .enable_time            = tps65910_enable_time,
        .set_mode               = tps65910_set_mode,
        .get_mode               = tps65910_get_mode,
-       .get_voltage            = tps65911_get_voltage,
+       .get_voltage_sel        = tps65911_get_voltage_sel,
        .set_voltage_sel        = tps65911_set_voltage_sel,
        .list_voltage           = tps65911_list_voltage,
 };
@@ -1097,6 +1038,7 @@ static int tps65910_set_ext_sleep_config(struct tps65910_reg *pmic,
 static __devinit int tps65910_probe(struct platform_device *pdev)
 {
        struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
+       struct regulator_config config = { };
        struct tps_info *info;
        struct regulator_init_data *reg_data;
        struct regulator_dev *rdev;
@@ -1108,7 +1050,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
        if (!pmic_plat_data)
                return -EINVAL;
 
-       pmic = kzalloc(sizeof(*pmic), GFP_KERNEL);
+       pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
        if (!pmic)
                return -ENOMEM;
 
@@ -1135,7 +1077,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
                break;
        default:
                pr_err("Invalid tps chip version\n");
-               kfree(pmic);
                return -ENODEV;
        }
 
@@ -1143,7 +1084,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
                        sizeof(struct regulator_desc), GFP_KERNEL);
        if (!pmic->desc) {
                err = -ENOMEM;
-               goto err_free_pmic;
+               goto err_out;
        }
 
        pmic->info = kcalloc(pmic->num_regulators,
@@ -1205,9 +1146,15 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
 
                pmic->desc[i].type = REGULATOR_VOLTAGE;
                pmic->desc[i].owner = THIS_MODULE;
+               pmic->desc[i].enable_reg = pmic->get_ctrl_reg(i);
+               pmic->desc[i].enable_mask = TPS65910_SUPPLY_STATE_ENABLED;
+
+               config.dev = tps65910->dev;
+               config.init_data = reg_data;
+               config.driver_data = pmic;
+               config.regmap = tps65910->regmap;
 
-               rdev = regulator_register(&pmic->desc[i],
-                               tps65910->dev, reg_data, pmic, NULL);
+               rdev = regulator_register(&pmic->desc[i], &config);
                if (IS_ERR(rdev)) {
                        dev_err(tps65910->dev,
                                "failed to register %s regulator\n",
@@ -1229,8 +1176,7 @@ err_free_info:
        kfree(pmic->info);
 err_free_desc:
        kfree(pmic->desc);
-err_free_pmic:
-       kfree(pmic);
+err_out:
        return err;
 }
 
@@ -1245,7 +1191,6 @@ static int __devexit tps65910_remove(struct platform_device *pdev)
        kfree(pmic->rdev);
        kfree(pmic->info);
        kfree(pmic->desc);
-       kfree(pmic);
        return 0;
 }