regulator: tps62360: Convert to regulator_list_voltage_linear()
PATCH 1/2 regulator: tps62360: Convert to regulator_list_voltage_linear()
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/tps62360-regulator.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-)
drivers/regulator/tps62360-regulator.c +6 -14
@@ -185,28 +185,17 @@ static int tps62360_dcdc_set_voltage(struct regulator_dev *dev,return 0 ; } -static int tps62360_dcdc_list_voltage (struct regulator_dev *dev, -unsigned selector) -{ -struct tps62360_chip *tps =rdev_get_drvdata (dev); - -if (selector >= tps->desc.n_voltages) -return -EINVAL ; - -return tps->voltage_base + selector *10000 ; -} -static int tps62360_set_voltage_time_sel (struct regulator_dev *rdev,unsigned int old_selector,unsigned int new_selector) {struct tps62360_chip *tps =rdev_get_drvdata (rdev);int old_uV, new_uV; - old_uV =tps62360_dcdc_list_voltage (rdev, old_selector); + old_uV =regulator_list_voltage_linear (rdev, old_selector);if (old_uV <0 )return old_uV; - new_uV =tps62360_dcdc_list_voltage (rdev, new_selector); + new_uV =regulator_list_voltage_linear (rdev, new_selector);if (new_uV <0 )return new_uV;
@@ -216,7 +205,7 @@ static int tps62360_set_voltage_time_sel(struct regulator_dev *rdev,static struct regulator_ops tps62360_dcdc_ops = { .get_voltage_sel = tps62360_dcdc_get_voltage_sel, .set_voltage = tps62360_dcdc_set_voltage, - .list_voltage = tps62360_dcdc_list_voltage, + .list_voltage = regulator_list_voltage_linear, .set_voltage_time_sel = tps62360_set_voltage_time_sel, };
@@ -420,6 +409,9 @@ static int __devinit tps62360_probe(struct i2c_client *client, tps->desc.ops = &tps62360_dcdc_ops; tps->desc.type =REGULATOR_VOLTAGE ; tps->desc.owner =THIS_MODULE ; + tps->desc.min_uV = tps->voltage_base; + tps->desc.uV_step =10000 ; + tps->regmap =devm_regmap_init_i2c (client, &tps62360_regmap_config);if (IS_ERR (tps->regmap)) { ret =PTR_ERR (tps->regmap);
Signature · 1 line
1.7.5.4
PATCH 2/2 regulator: tps62360: Convert to set_voltage_sel and regulator_map_voltage_linear
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/tps62360-regulator.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-)
drivers/regulator/tps62360-regulator.c +7 -17
@@ -137,35 +137,24 @@ static int tps62360_dcdc_get_voltage_sel(struct regulator_dev *dev)return vsel; } -static int tps62360_dcdc_set_voltage (struct regulator_dev *dev, -int min_uV,int max_uV,unsigned *selector) +static int tps62360_dcdc_set_voltage_sel (struct regulator_dev *dev, +unsigned selector) {struct tps62360_chip *tps =rdev_get_drvdata (dev); -int vsel;int ret;bool found = false;int new_vset_id = tps->curr_vset_id; -if ((max_uV < min_uV) || (max_uV < tps->voltage_base)) -return -EINVAL ; - -if (min_uV > (tps->voltage_base + (tps->desc.n_voltages -1 ) *10000 )) -return -EINVAL ; - - vsel =DIV_ROUND_UP (min_uV - tps->voltage_base,10000 ); -if (selector) - *selector = (vsel & tps->voltage_reg_mask); -/* * If gpios are available to select the VSET register then least * recently used register for new configuration. */ if (tps->valid_gpios) - found =find_voltage_set_register (tps, vsel, &new_vset_id); + found =find_voltage_set_register (tps, selector, &new_vset_id);if (!found) { ret =regmap_update_bits (tps->regmap,REG_VSET0 + new_vset_id, - tps->voltage_reg_mask, vsel); + tps->voltage_reg_mask, selector);if (ret <0 ) { dev_err(tps->dev, "%s(): register %d update failed with err %d\n",
@@ -173,7 +162,7 @@ static int tps62360_dcdc_set_voltage(struct regulator_dev *dev,return ret; } tps->curr_vset_id = new_vset_id; - tps->curr_vset_vsel[new_vset_id] = vsel; + tps->curr_vset_vsel[new_vset_id] = selector; }/* Select proper VSET register vio gpios */
@@ -204,8 +193,9 @@ static int tps62360_set_voltage_time_sel(struct regulator_dev *rdev,static struct regulator_ops tps62360_dcdc_ops = { .get_voltage_sel = tps62360_dcdc_get_voltage_sel, - .set_voltage = tps62360_dcdc_set_voltage, + .set_voltage_sel = tps62360_dcdc_set_voltage_sel, .list_voltage = regulator_list_voltage_linear, + .map_voltage = regulator_map_voltage_linear, .set_voltage_time_sel = tps62360_set_voltage_time_sel, };
Signature · 1 line
1.7.5.4
Quoted 4 lines · Axel Lin
Signed-off-by Axel Lin<[email protected]>--- drivers/regulator/tps62360-regulator.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-)
Acked-by Laxman Dewangan <[email protected]>
Mark Brown
AppliedQuoted 1 line · Axel Lin
Signed-off-by Axel Lin <[email protected]>
Applied both, thanks.