regulator: Simplify the implementation of tps65912_get_voltage_dcdc
Call tps65912_list_voltage_dcdc instead of duplicating the same code. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
21c9e5f19e
commit
844775ef98
|
@ -506,33 +506,73 @@ static unsigned int tps65912_get_mode(struct regulator_dev *dev)
|
|||
return mode;
|
||||
}
|
||||
|
||||
static int tps65912_list_voltage_dcdc(struct regulator_dev *dev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct tps65912_reg *pmic = rdev_get_drvdata(dev);
|
||||
int range, voltage = 0, id = rdev_get_id(dev);
|
||||
|
||||
switch (id) {
|
||||
case TPS65912_REG_DCDC1:
|
||||
range = pmic->dcdc1_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC2:
|
||||
range = pmic->dcdc2_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC3:
|
||||
range = pmic->dcdc3_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC4:
|
||||
range = pmic->dcdc4_range;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (range) {
|
||||
case 0:
|
||||
/* 0.5 - 1.2875V in 12.5mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range0(selector);
|
||||
break;
|
||||
case 1:
|
||||
/* 0.7 - 1.4875V in 12.5mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range1(selector);
|
||||
break;
|
||||
case 2:
|
||||
/* 0.5 - 2.075V in 25mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range2(selector);
|
||||
break;
|
||||
case 3:
|
||||
/* 0.5 - 3.8V in 50mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range3(selector);
|
||||
break;
|
||||
}
|
||||
return voltage;
|
||||
}
|
||||
|
||||
static int tps65912_get_voltage_dcdc(struct regulator_dev *dev)
|
||||
{
|
||||
struct tps65912_reg *pmic = rdev_get_drvdata(dev);
|
||||
struct tps65912 *mfd = pmic->mfd;
|
||||
int id = rdev_get_id(dev), voltage = 0, range;
|
||||
int id = rdev_get_id(dev);
|
||||
int opvsel = 0, avsel = 0, sr, vsel;
|
||||
|
||||
switch (id) {
|
||||
case TPS65912_REG_DCDC1:
|
||||
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC1_OP);
|
||||
avsel = tps65912_reg_read(mfd, TPS65912_DCDC1_AVS);
|
||||
range = pmic->dcdc1_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC2:
|
||||
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC2_OP);
|
||||
avsel = tps65912_reg_read(mfd, TPS65912_DCDC2_AVS);
|
||||
range = pmic->dcdc2_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC3:
|
||||
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC3_OP);
|
||||
avsel = tps65912_reg_read(mfd, TPS65912_DCDC3_AVS);
|
||||
range = pmic->dcdc3_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC4:
|
||||
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC4_OP);
|
||||
avsel = tps65912_reg_read(mfd, TPS65912_DCDC4_AVS);
|
||||
range = pmic->dcdc4_range;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
|
@ -545,25 +585,7 @@ static int tps65912_get_voltage_dcdc(struct regulator_dev *dev)
|
|||
vsel = opvsel;
|
||||
vsel &= 0x3F;
|
||||
|
||||
switch (range) {
|
||||
case 0:
|
||||
/* 0.5 - 1.2875V in 12.5mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range0(vsel);
|
||||
break;
|
||||
case 1:
|
||||
/* 0.7 - 1.4875V in 12.5mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range1(vsel);
|
||||
break;
|
||||
case 2:
|
||||
/* 0.5 - 2.075V in 25mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range2(vsel);
|
||||
break;
|
||||
case 3:
|
||||
/* 0.5 - 3.8V in 50mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range3(vsel);
|
||||
break;
|
||||
}
|
||||
return voltage;
|
||||
return tps65912_list_voltage_dcdc(dev, vsel);
|
||||
}
|
||||
|
||||
static int tps65912_set_voltage_dcdc(struct regulator_dev *dev,
|
||||
|
@ -609,50 +631,6 @@ static int tps65912_set_voltage_ldo(struct regulator_dev *dev,
|
|||
return tps65912_reg_write(mfd, reg, selector | value);
|
||||
}
|
||||
|
||||
static int tps65912_list_voltage_dcdc(struct regulator_dev *dev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct tps65912_reg *pmic = rdev_get_drvdata(dev);
|
||||
int range, voltage = 0, id = rdev_get_id(dev);
|
||||
|
||||
switch (id) {
|
||||
case TPS65912_REG_DCDC1:
|
||||
range = pmic->dcdc1_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC2:
|
||||
range = pmic->dcdc2_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC3:
|
||||
range = pmic->dcdc3_range;
|
||||
break;
|
||||
case TPS65912_REG_DCDC4:
|
||||
range = pmic->dcdc4_range;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (range) {
|
||||
case 0:
|
||||
/* 0.5 - 1.2875V in 12.5mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range0(selector);
|
||||
break;
|
||||
case 1:
|
||||
/* 0.7 - 1.4875V in 12.5mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range1(selector);
|
||||
break;
|
||||
case 2:
|
||||
/* 0.5 - 2.075V in 25mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range2(selector);
|
||||
break;
|
||||
case 3:
|
||||
/* 0.5 - 3.8V in 50mV steps */
|
||||
voltage = tps65912_vsel_to_uv_range3(selector);
|
||||
break;
|
||||
}
|
||||
return voltage;
|
||||
}
|
||||
|
||||
static int tps65912_list_voltage_ldo(struct regulator_dev *dev,
|
||||
unsigned selector)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue