提交 ff398c45 编写于 作者: L Linus Torvalds

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "Another small batch of driver specific bug fixes, a couple more errors
  in the da9052 driver and a bad return value in the tps6524x driver."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: da9052: Ensure the selected voltage falls within the specified range
  regulator: Set n_voltages for da9052 regulators
  regulator: Fix setting selector in tps6524x set_voltage function
...@@ -226,7 +226,7 @@ static int da9052_regulator_set_voltage_int(struct regulator_dev *rdev, ...@@ -226,7 +226,7 @@ static int da9052_regulator_set_voltage_int(struct regulator_dev *rdev,
if (min_uV < info->min_uV) if (min_uV < info->min_uV)
min_uV = info->min_uV; min_uV = info->min_uV;
*selector = (min_uV - info->min_uV) / info->step_uV; *selector = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
ret = da9052_list_voltage(rdev, *selector); ret = da9052_list_voltage(rdev, *selector);
if (ret < 0) if (ret < 0)
...@@ -318,10 +318,10 @@ static int da9052_set_buckperi_voltage(struct regulator_dev *rdev, int min_uV, ...@@ -318,10 +318,10 @@ static int da9052_set_buckperi_voltage(struct regulator_dev *rdev, int min_uV,
if ((regulator->da9052->chip_id == DA9052) && if ((regulator->da9052->chip_id == DA9052) &&
(min_uV >= DA9052_CONST_3uV)) (min_uV >= DA9052_CONST_3uV))
*selector = DA9052_BUCK_PERI_REG_MAP_UPTO_3uV + *selector = DA9052_BUCK_PERI_REG_MAP_UPTO_3uV +
((min_uV - DA9052_CONST_3uV) / DIV_ROUND_UP(min_uV - DA9052_CONST_3uV,
(DA9052_BUCK_PERI_3uV_STEP)); DA9052_BUCK_PERI_3uV_STEP);
else else
*selector = (min_uV - info->min_uV) / info->step_uV; *selector = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
ret = da9052_list_buckperi_voltage(rdev, *selector); ret = da9052_list_buckperi_voltage(rdev, *selector);
if (ret < 0) if (ret < 0)
...@@ -400,6 +400,7 @@ static struct regulator_ops da9052_ldo_ops = { ...@@ -400,6 +400,7 @@ static struct regulator_ops da9052_ldo_ops = {
.ops = &da9052_ldo5_6_ops,\ .ops = &da9052_ldo5_6_ops,\
.type = REGULATOR_VOLTAGE,\ .type = REGULATOR_VOLTAGE,\
.id = _id,\ .id = _id,\
.n_voltages = (max - min) / step + 1, \
.owner = THIS_MODULE,\ .owner = THIS_MODULE,\
},\ },\
.min_uV = (min) * 1000,\ .min_uV = (min) * 1000,\
...@@ -417,6 +418,7 @@ static struct regulator_ops da9052_ldo_ops = { ...@@ -417,6 +418,7 @@ static struct regulator_ops da9052_ldo_ops = {
.ops = &da9052_ldo_ops,\ .ops = &da9052_ldo_ops,\
.type = REGULATOR_VOLTAGE,\ .type = REGULATOR_VOLTAGE,\
.id = _id,\ .id = _id,\
.n_voltages = (max - min) / step + 1, \
.owner = THIS_MODULE,\ .owner = THIS_MODULE,\
},\ },\
.min_uV = (min) * 1000,\ .min_uV = (min) * 1000,\
...@@ -434,6 +436,7 @@ static struct regulator_ops da9052_ldo_ops = { ...@@ -434,6 +436,7 @@ static struct regulator_ops da9052_ldo_ops = {
.ops = &da9052_dcdc_ops,\ .ops = &da9052_dcdc_ops,\
.type = REGULATOR_VOLTAGE,\ .type = REGULATOR_VOLTAGE,\
.id = _id,\ .id = _id,\
.n_voltages = (max - min) / step + 1, \
.owner = THIS_MODULE,\ .owner = THIS_MODULE,\
},\ },\
.min_uV = (min) * 1000,\ .min_uV = (min) * 1000,\
...@@ -451,6 +454,7 @@ static struct regulator_ops da9052_ldo_ops = { ...@@ -451,6 +454,7 @@ static struct regulator_ops da9052_ldo_ops = {
.ops = &da9052_buckperi_ops,\ .ops = &da9052_buckperi_ops,\
.type = REGULATOR_VOLTAGE,\ .type = REGULATOR_VOLTAGE,\
.id = _id,\ .id = _id,\
.n_voltages = (max - min) / step + 1, \
.owner = THIS_MODULE,\ .owner = THIS_MODULE,\
},\ },\
.min_uV = (min) * 1000,\ .min_uV = (min) * 1000,\
......
...@@ -481,7 +481,7 @@ static int set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, ...@@ -481,7 +481,7 @@ static int set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
if (i >= info->n_voltages) if (i >= info->n_voltages)
i = info->n_voltages - 1; i = info->n_voltages - 1;
*selector = info->voltages[i]; *selector = i;
return write_field(hw, &info->voltage, i); return write_field(hw, &info->voltage, i);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册