mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 10:57:46 +00:00
Code Issues Releases Wiki Activity

regulator: pfuze100: Fix n_voltages setting for SW2~SW4 with high bit set

Browse source 
Current code adjust min_uV and uV_step but missed adjusting the n_voltages
setting.

When BIT6 is clear:
        n_voltages = (1975000 - 400000) / 25000 + 1 = 64
When BIT6 is set:
        n_voltages = (3300000 - 800000) / 50000 + 1 = 51

The n_voltages needs update because when BIT6 is set 0x73 ~ 0x7f are reserved.
When using regulator_list_voltage_linear, the n_voltages does matter here
because wrong n_voltages setting make the equation return wrong result.
e.g. if selector is 63, regulator_list_voltage_linear returns
     800000 + (50000 * 63) = 4000000
     It should return -EINVAL if the selector is in the range of 51 ~ 63.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Axel Lin 2013-07-30 10:46:28 +08:00 committed by Mark Brown
parent 2e04cc41a6
commit d9493234e2
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/regulator/pfuze100-regulator.c
View file

@ -388,8 +388,11 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
for (i = 0; i < PFUZE100_MAX_REGULATOR; i++) {
struct regulator_init_data *init_data;
struct regulator_desc *desc;
int val;
desc = &pfuze_chip->regulator_descs[i].desc;
if (pdata)
init_data = pdata->init_data[i];
else
@ -397,13 +400,11 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
/* SW2~SW4 high bit check and modify the voltage value table */
if (i > PFUZE100_SW1C && i < PFUZE100_SWBST) {
regmap_read(pfuze_chip->regmap, PFUZE100_SW2VOL +
(i - PFUZE100_SW2) * 7, &val);
regmap_read(pfuze_chip->regmap, desc->vsel_reg, &val);
if (val & 0x40) {
pfuze_chip->regulator_descs[i].desc.min_uV
= 800000;
pfuze_chip->regulator_descs[i].desc.uV_step
= 50000;
desc->min_uV = 800000;
desc->uV_step = 50000;
desc->n_voltages = 51;
}
}
@ -412,8 +413,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
config.driver_data = pfuze_chip;
config.of_node = match_of_node(i);
pfuze_chip->regulators[i] = regulator_register(&pfuze_chip
->regulator_descs[i].desc, &config);
pfuze_chip->regulators[i] = regulator_register(desc, &config);
if (IS_ERR(pfuze_chip->regulators[i])) {
dev_err(&client->dev, "register regulator%s failed\n",
pfuze100_regulators[i].desc.name);