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

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

regulator: max8998: Convert to regulator_list_voltage_linear() 



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

drivers/regulator/max8998.c

+7 −25
Original line number Diff line number Diff line
@@ -111,27 +111,6 @@ static const struct voltage_map_desc *ldo_voltage_map[] = { 
	&buck4_voltage_map_desc,	/* BUCK4 */

};



static int max8998_list_voltage(struct regulator_dev *rdev,

				unsigned int selector)

{

	const struct voltage_map_desc *desc;

	int ldo = rdev_get_id(rdev);

	int val;



	if (ldo >= ARRAY_SIZE(ldo_voltage_map))

		return -EINVAL;



	desc = ldo_voltage_map[ldo];

	if (desc == NULL)

		return -EINVAL;



	val = desc->min + desc->step * selector;

	if (val > desc->max)

		return -EINVAL;



	return val * 1000;

}



static int max8998_get_enable_register(struct regulator_dev *rdev,

					int *reg, int *shift)

{
@@ -392,8 +371,8 @@ static int max8998_set_voltage_buck(struct regulator_dev *rdev, 
	/* if previous_voltage equal new voltage, return */

	if (previous_sel == i) {

		dev_dbg(max8998->dev, "No voltage change, old:%d, new:%d\n",

			max8998_list_voltage(rdev, previous_sel),

			max8998_list_voltage(rdev, i));

			regulator_list_voltage_linear(rdev, previous_sel),

			regulator_list_voltage_linear(rdev, i));

		return ret;

	}
@@ -519,7 +498,7 @@ static int max8998_set_voltage_buck_time_sel(struct regulator_dev *rdev, 
}



static struct regulator_ops max8998_ldo_ops = {

	.list_voltage		= max8998_list_voltage,

	.list_voltage		= regulator_list_voltage_linear,

	.is_enabled		= max8998_ldo_is_enabled,

	.enable			= max8998_ldo_enable,

	.disable		= max8998_ldo_disable,
@@ -530,7 +509,7 @@ static struct regulator_ops max8998_ldo_ops = { 
};



static struct regulator_ops max8998_buck_ops = {

	.list_voltage		= max8998_list_voltage,

	.list_voltage		= regulator_list_voltage_linear,

	.is_enabled		= max8998_ldo_is_enabled,

	.enable			= max8998_ldo_enable,

	.disable		= max8998_ldo_disable,
@@ -860,7 +839,10 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev) 
		desc = ldo_voltage_map[id];

		if (desc && regulators[index].ops != &max8998_others_ops) {

			int count = (desc->max - desc->min) / desc->step + 1;



			regulators[index].n_voltages = count;

			regulators[index].min_uV = desc->min * 1000;

			regulators[index].uV_step = desc->step * 1000;

		}



		config.dev = max8998->dev;