Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 831c986f authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: Use tps65912_set_voltage_sel for both DCDCx and LDOx 



commit 42b5ef "regulator: tps65912: Use simple equations to get register address"
uses tps65912_get_sel_register to replace tps65912_get_dcdc_sel_register
and tps65912_get_ldo_sel_register.

Now tps65912_set_voltage_dcdc_sel and tps65912_set_voltage_ldo_sel has exactly
the same implementation. Merge them to tps65912_set_voltage_sel function.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0651eed5

drivers/regulator/tps65912-regulator.c

+3 −16
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int tps65912_get_voltage_dcdc(struct regulator_dev *dev) 
	return tps65912_list_voltage_dcdc(dev, vsel);

}



static int tps65912_set_voltage_dcdc_sel(struct regulator_dev *dev,

static int tps65912_set_voltage_sel(struct regulator_dev *dev,

					 unsigned selector)

{

	struct tps65912_reg *pmic = rdev_get_drvdata(dev);
@@ -472,19 +472,6 @@ static int tps65912_get_voltage_ldo(struct regulator_dev *dev) 
	return tps65912_vsel_to_uv_ldo(vsel);

}



static int tps65912_set_voltage_ldo_sel(struct regulator_dev *dev,

					unsigned selector)

{

	struct tps65912_reg *pmic = rdev_get_drvdata(dev);

	struct tps65912 *mfd = pmic->mfd;

	int id = rdev_get_id(dev), reg, value;



	reg = tps65912_get_sel_register(pmic, id);

	value = tps65912_reg_read(mfd, reg);

	value &= 0xC0;

	return tps65912_reg_write(mfd, reg, selector | value);

}



static int tps65912_list_voltage_ldo(struct regulator_dev *dev,

					unsigned selector)

{
@@ -504,7 +491,7 @@ static struct regulator_ops tps65912_ops_dcdc = { 
	.set_mode = tps65912_set_mode,

	.get_mode = tps65912_get_mode,

	.get_voltage = tps65912_get_voltage_dcdc,

	.set_voltage_sel = tps65912_set_voltage_dcdc_sel,

	.set_voltage_sel = tps65912_set_voltage_sel,

	.list_voltage = tps65912_list_voltage_dcdc,

};
@@ -514,7 +501,7 @@ static struct regulator_ops tps65912_ops_ldo = { 
	.enable = tps65912_reg_enable,

	.disable = tps65912_reg_disable,

	.get_voltage = tps65912_get_voltage_ldo,

	.set_voltage_sel = tps65912_set_voltage_ldo_sel,

	.set_voltage_sel = tps65912_set_voltage_sel,

	.list_voltage = tps65912_list_voltage_ldo,

};