Skip to content

Commit

Permalink
regulator: palmas: Use regulator_[list|map]_voltage_linear() for palm…
Browse files Browse the repository at this point in the history
…as_ops_smps10

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
AxelLin authored and broonie committed Jun 3, 2012
1 parent 107a396 commit 8029a00
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/regulator/palmas-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,19 +400,14 @@ static struct regulator_ops palmas_ops_smps = {
.map_voltage = palmas_map_voltage_smps,
};

static int palmas_list_voltage_smps10(struct regulator_dev *dev,
unsigned selector)
{
return 3750000 + (selector * 1250000);
}

static struct regulator_ops palmas_ops_smps10 = {
.is_enabled = regulator_is_enabled_regmap,
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
.get_voltage_sel = regulator_get_voltage_sel_regmap,
.set_voltage_sel = regulator_set_voltage_sel_regmap,
.list_voltage = palmas_list_voltage_smps10,
.list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
};

static int palmas_is_enabled_ldo(struct regulator_dev *dev)
Expand Down Expand Up @@ -675,6 +670,8 @@ static __devinit int palmas_probe(struct platform_device *pdev)
pmic->desc[id].vsel_mask = SMPS10_VSEL;
pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;
pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
pmic->desc[id].min_uV = 3750000;
pmic->desc[id].uV_step = 1250000;
}

pmic->desc[id].type = REGULATOR_VOLTAGE;
Expand Down

0 comments on commit 8029a00

Please sign in to comment.