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

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

regulator: Implement tps65912_list_voltage to be shared by both DCDCs and LDOs 



Merge tps65912_list_voltage_dcdc and tps65912_list_voltage_ldo to
tps65912_list_voltage.  This change does not add too much complexity in
tps65912_list_voltage function.

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

drivers/regulator/tps65912-regulator.c

+7 −16
Original line number Original line Diff line number Diff line
@@ -372,12 +372,14 @@ static unsigned int tps65912_get_mode(struct regulator_dev *dev) 
	return mode;

	return mode;

}

}





static int tps65912_list_voltage_dcdc(struct regulator_dev *dev,

static int tps65912_list_voltage(struct regulator_dev *dev, unsigned selector)

					unsigned selector)

{

{

	struct tps65912_reg *pmic = rdev_get_drvdata(dev);

	struct tps65912_reg *pmic = rdev_get_drvdata(dev);

	int range, voltage = 0, id = rdev_get_id(dev);

	int range, voltage = 0, id = rdev_get_id(dev);





	if (id >= TPS65912_REG_LDO1 && id <= TPS65912_REG_LDO10)

		return tps65912_vsel_to_uv_ldo(selector);



	if (id > TPS65912_REG_DCDC4)

	if (id > TPS65912_REG_DCDC4)

		return -EINVAL;

		return -EINVAL;
@@ -418,7 +420,7 @@ static int tps65912_get_voltage_dcdc(struct regulator_dev *dev) 
	vsel = tps65912_reg_read(mfd, reg);

	vsel = tps65912_reg_read(mfd, reg);

	vsel &= 0x3F;

	vsel &= 0x3F;





	return tps65912_list_voltage_dcdc(dev, vsel);

	return tps65912_list_voltage(dev, vsel);

}

}





static int tps65912_set_voltage_sel(struct regulator_dev *dev,

static int tps65912_set_voltage_sel(struct regulator_dev *dev,
@@ -451,17 +453,6 @@ static int tps65912_get_voltage_ldo(struct regulator_dev *dev) 
	return tps65912_vsel_to_uv_ldo(vsel);

	return tps65912_vsel_to_uv_ldo(vsel);

}

}





static int tps65912_list_voltage_ldo(struct regulator_dev *dev,

					unsigned selector)

{

	int ldo = rdev_get_id(dev);



	if (ldo < TPS65912_REG_LDO1 || ldo > TPS65912_REG_LDO10)

		return -EINVAL;



	return tps65912_vsel_to_uv_ldo(selector);

}



/* Operations permitted on DCDCx */

/* Operations permitted on DCDCx */

static struct regulator_ops tps65912_ops_dcdc = {

static struct regulator_ops tps65912_ops_dcdc = {

	.is_enabled = tps65912_reg_is_enabled,

	.is_enabled = tps65912_reg_is_enabled,
@@ -471,7 +462,7 @@ static struct regulator_ops tps65912_ops_dcdc = { 
	.get_mode = tps65912_get_mode,

	.get_mode = tps65912_get_mode,

	.get_voltage = tps65912_get_voltage_dcdc,

	.get_voltage = tps65912_get_voltage_dcdc,

	.set_voltage_sel = tps65912_set_voltage_sel,

	.set_voltage_sel = tps65912_set_voltage_sel,

	.list_voltage = tps65912_list_voltage_dcdc,

	.list_voltage = tps65912_list_voltage,

};

};





/* Operations permitted on LDOx */

/* Operations permitted on LDOx */
@@ -481,7 +472,7 @@ static struct regulator_ops tps65912_ops_ldo = { 
	.disable = tps65912_reg_disable,

	.disable = tps65912_reg_disable,

	.get_voltage = tps65912_get_voltage_ldo,

	.get_voltage = tps65912_get_voltage_ldo,

	.set_voltage_sel = tps65912_set_voltage_sel,

	.set_voltage_sel = tps65912_set_voltage_sel,

	.list_voltage = tps65912_list_voltage_ldo,

	.list_voltage = tps65912_list_voltage,

};

};





static __devinit int tps65912_probe(struct platform_device *pdev)

static __devinit int tps65912_probe(struct platform_device *pdev)