Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[cascardo/linux.git] / drivers / regulator / 88pm8607.c

diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index 06d9c4b..c3482b9 100644 (file)
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -27,12 +27,8 @@ struct pm8607_regulator_info {
        unsigned int    *vol_table;
        unsigned int    *vol_suspend;
 
-       int     vol_reg;
-       int     vol_shift;
        int     update_reg;
        int     update_bit;
-       int     enable_reg;
-       int     enable_bit;
        int     slope_double;
 };
 
@@ -226,13 +222,13 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index)
 static int pm8607_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
 {
        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-       uint8_t val, mask;
+       uint8_t val;
        int ret;
 
-       val = (uint8_t)(selector << info->vol_shift);
-       mask = (rdev->desc->n_voltages - 1)  << info->vol_shift;
+       val = (uint8_t)(selector << (ffs(rdev->desc->vsel_mask) - 1));
 
-       ret = pm860x_set_bits(info->i2c, info->vol_reg, mask, val);
+       ret = pm860x_set_bits(info->i2c, rdev->desc->vsel_reg,
+                             rdev->desc->vsel_mask, val);
        if (ret)
                return ret;
        switch (info->desc.id) {
@@ -246,58 +242,13 @@ static int pm8607_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
        return ret;
 }
 
-static int pm8607_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-       uint8_t val, mask;
-       int ret;
-
-       ret = pm860x_reg_read(info->i2c, info->vol_reg);
-       if (ret < 0)
-               return ret;
-
-       mask = (rdev->desc->n_voltages - 1)  << info->vol_shift;
-       val = ((unsigned char)ret & mask) >> info->vol_shift;
-
-       return val;
-}
-
-static int pm8607_enable(struct regulator_dev *rdev)
-{
-       struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-
-       return pm860x_set_bits(info->i2c, info->enable_reg,
-                              1 << info->enable_bit,
-                              1 << info->enable_bit);
-}
-
-static int pm8607_disable(struct regulator_dev *rdev)
-{
-       struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-
-       return pm860x_set_bits(info->i2c, info->enable_reg,
-                              1 << info->enable_bit, 0);
-}
-
-static int pm8607_is_enabled(struct regulator_dev *rdev)
-{
-       struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-       int ret;
-
-       ret = pm860x_reg_read(info->i2c, info->enable_reg);
-       if (ret < 0)
-               return ret;
-
-       return !!((unsigned char)ret & (1 << info->enable_bit));
-}
-
 static struct regulator_ops pm8607_regulator_ops = {
        .list_voltage   = pm8607_list_voltage,
        .set_voltage_sel = pm8607_set_voltage_sel,
-       .get_voltage_sel = pm8607_get_voltage_sel,
-       .enable         = pm8607_enable,
-       .disable        = pm8607_disable,
-       .is_enabled     = pm8607_is_enabled,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
 };
 
 #define PM8607_DVC(vreg, ureg, ubit, ereg, ebit)                       \
@@ -309,13 +260,13 @@ static struct regulator_ops pm8607_regulator_ops = {
                .id     = PM8607_ID_##vreg,                             \
                .owner  = THIS_MODULE,                                  \
                .n_voltages = ARRAY_SIZE(vreg##_table),                 \
+               .vsel_reg = PM8607_##vreg,                              \
+               .vsel_mask = ARRAY_SIZE(vreg##_table) - 1,              \
+               .enable_reg = PM8607_##ereg,                            \
+               .enable_mask = 1 << (ebit),                             \
        },                                                              \
-       .vol_reg        = PM8607_##vreg,                                \
-       .vol_shift      = (0),                                          \
        .update_reg     = PM8607_##ureg,                                \
        .update_bit     = (ubit),                                       \
-       .enable_reg     = PM8607_##ereg,                                \
-       .enable_bit     = (ebit),                                       \
        .slope_double   = (0),                                          \
        .vol_table      = (unsigned int *)&vreg##_table,                \
        .vol_suspend    = (unsigned int *)&vreg##_suspend_table,        \
@@ -330,11 +281,11 @@ static struct regulator_ops pm8607_regulator_ops = {
                .id     = PM8607_ID_LDO##_id,                           \
                .owner  = THIS_MODULE,                                  \
                .n_voltages = ARRAY_SIZE(LDO##_id##_table),             \
+               .vsel_reg = PM8607_##vreg,                              \
+               .vsel_mask = (ARRAY_SIZE(LDO##_id##_table) - 1) << (shift), \
+               .enable_reg = PM8607_##ereg,                            \
+               .enable_mask = 1 << (ebit),                             \
        },                                                              \
-       .vol_reg        = PM8607_##vreg,                                \
-       .vol_shift      = (shift),                                      \
-       .enable_reg     = PM8607_##ereg,                                \
-       .enable_bit     = (ebit),                                       \
        .slope_double   = (0),                                          \
        .vol_table      = (unsigned int *)&LDO##_id##_table,            \
        .vol_suspend    = (unsigned int *)&LDO##_id##_suspend_table,    \
@@ -395,6 +346,11 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
        config.init_data = pdata;
        config.driver_data = info;
 
+       if (chip->id == CHIP_PM8607)
+               config.regmap = chip->regmap;
+       else
+               config.regmap = chip->regmap_companion;
+
        /* replace driver_data with info */
        info->regulator = regulator_register(&info->desc, &config);
        if (IS_ERR(info->regulator)) {