lkml.org 
[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH RFT 2/3] regulator: da9052: Use regulator_get_voltage_sel_regmap()
    From
    Date
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/da9052-regulator.c | 32 ++++++++------------------------
    1 files changed, 8 insertions(+), 24 deletions(-)

    diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
    index 4f2e6f9..16815f1 100644
    --- a/drivers/regulator/da9052-regulator.c
    +++ b/drivers/regulator/da9052-regulator.c
    @@ -70,7 +70,6 @@ struct da9052_regulator_info {
    int step_uV;
    int min_uV;
    int max_uV;
    - unsigned char volt_shift;
    unsigned char activate_bit;
    };

    @@ -209,9 +208,8 @@ static int da9052_regulator_set_voltage(struct regulator_dev *rdev,
    if (ret < 0)
    return ret;

    - ret = da9052_reg_update(regulator->da9052,
    - DA9052_BUCKCORE_REG + id,
    - (1 << info->volt_shift) - 1, *selector);
    + ret = da9052_reg_update(regulator->da9052, rdev->desc->vsel_reg,
    + rdev->desc->vsel_mask, *selector);
    if (ret < 0)
    return ret;

    @@ -232,29 +230,13 @@ static int da9052_regulator_set_voltage(struct regulator_dev *rdev,
    return ret;
    }

    -static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev)
    -{
    - struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
    - struct da9052_regulator_info *info = regulator->info;
    - int offset = rdev_get_id(rdev);
    - int ret;
    -
    - ret = da9052_reg_read(regulator->da9052, DA9052_BUCKCORE_REG + offset);
    - if (ret < 0)
    - return ret;
    -
    - ret &= ((1 << info->volt_shift) - 1);
    -
    - return ret;
    -}
    -
    static struct regulator_ops da9052_dcdc_ops = {
    .set_voltage = da9052_regulator_set_voltage,
    .get_current_limit = da9052_dcdc_get_current_limit,
    .set_current_limit = da9052_dcdc_set_current_limit,

    .list_voltage = da9052_list_voltage,
    - .get_voltage_sel = da9052_get_regulator_voltage_sel,
    + .get_voltage_sel = regulator_get_voltage_sel_regmap,
    .is_enabled = regulator_is_enabled_regmap,
    .enable = regulator_enable_regmap,
    .disable = regulator_disable_regmap,
    @@ -264,7 +246,7 @@ static struct regulator_ops da9052_ldo_ops = {
    .set_voltage = da9052_regulator_set_voltage,

    .list_voltage = da9052_list_voltage,
    - .get_voltage_sel = da9052_get_regulator_voltage_sel,
    + .get_voltage_sel = regulator_get_voltage_sel_regmap,
    .is_enabled = regulator_is_enabled_regmap,
    .enable = regulator_enable_regmap,
    .disable = regulator_disable_regmap,
    @@ -279,13 +261,14 @@ static struct regulator_ops da9052_ldo_ops = {
    .id = DA9052_ID_##_id,\
    .n_voltages = (max - min) / step + 1, \
    .owner = THIS_MODULE,\
    + .vsel_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
    + .vsel_mask = (1 << (sbits)) - 1,\
    .enable_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
    .enable_mask = 1 << (ebits),\
    },\
    .min_uV = (min) * 1000,\
    .max_uV = (max) * 1000,\
    .step_uV = (step) * 1000,\
    - .volt_shift = (sbits),\
    .activate_bit = (abits),\
    }

    @@ -298,13 +281,14 @@ static struct regulator_ops da9052_ldo_ops = {
    .id = DA9052_ID_##_id,\
    .n_voltages = (max - min) / step + 1, \
    .owner = THIS_MODULE,\
    + .vsel_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
    + .vsel_mask = (1 << (sbits)) - 1,\
    .enable_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
    .enable_mask = 1 << (ebits),\
    },\
    .min_uV = (min) * 1000,\
    .max_uV = (max) * 1000,\
    .step_uV = (step) * 1000,\
    - .volt_shift = (sbits),\
    .activate_bit = (abits),\
    }

    --
    1.7.5.4




    \
     
     \ /
      Last update: 2012-04-24 03:57    [W:0.036 / U:32.604 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site