hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Axel Lin 2012-03-08 12:07:37 +08:00 committed by Mark Brown
parent 21c9e5f19e
commit 844775ef98
1 changed files with 46 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
drivers/regulator/tps65912-regulator.c
View File

@ -506,33 +506,73 @@ static unsigned int tps65912_get_mode(struct regulator_dev *dev)
return mode; 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) static int tps65912_get_voltage_dcdc(struct regulator_dev *dev)
{ {
struct tps65912_reg *pmic = rdev_get_drvdata(dev); struct tps65912_reg *pmic = rdev_get_drvdata(dev);
struct tps65912 *mfd = pmic->mfd; 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; int opvsel = 0, avsel = 0, sr, vsel;
switch (id) { switch (id) {
case TPS65912_REG_DCDC1: case TPS65912_REG_DCDC1:
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC1_OP); opvsel = tps65912_reg_read(mfd, TPS65912_DCDC1_OP);
avsel = tps65912_reg_read(mfd, TPS65912_DCDC1_AVS); avsel = tps65912_reg_read(mfd, TPS65912_DCDC1_AVS);
range = pmic->dcdc1_range;
break; break;
case TPS65912_REG_DCDC2: case TPS65912_REG_DCDC2:
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC2_OP); opvsel = tps65912_reg_read(mfd, TPS65912_DCDC2_OP);
avsel = tps65912_reg_read(mfd, TPS65912_DCDC2_AVS); avsel = tps65912_reg_read(mfd, TPS65912_DCDC2_AVS);
range = pmic->dcdc2_range;
break; break;
case TPS65912_REG_DCDC3: case TPS65912_REG_DCDC3:
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC3_OP); opvsel = tps65912_reg_read(mfd, TPS65912_DCDC3_OP);
avsel = tps65912_reg_read(mfd, TPS65912_DCDC3_AVS); avsel = tps65912_reg_read(mfd, TPS65912_DCDC3_AVS);
range = pmic->dcdc3_range;
break; break;
case TPS65912_REG_DCDC4: case TPS65912_REG_DCDC4:
opvsel = tps65912_reg_read(mfd, TPS65912_DCDC4_OP); opvsel = tps65912_reg_read(mfd, TPS65912_DCDC4_OP);
avsel = tps65912_reg_read(mfd, TPS65912_DCDC4_AVS); avsel = tps65912_reg_read(mfd, TPS65912_DCDC4_AVS);
range = pmic->dcdc4_range;
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -545,25 +585,7 @@ static int tps65912_get_voltage_dcdc(struct regulator_dev *dev)
vsel = opvsel; vsel = opvsel;
vsel &= 0x3F; vsel &= 0x3F;
switch (range) { return tps65912_list_voltage_dcdc(dev, vsel);
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;
} }
static int tps65912_set_voltage_dcdc(struct regulator_dev *dev, 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); 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, static int tps65912_list_voltage_ldo(struct regulator_dev *dev,
unsigned selector) unsigned selector)
{ {