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

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

regulator: Convert max8997 to get_voltage_sel 



Also rename get_current_limit and set_current_limit callbacks
to max8997_get_current_limit and max8997_set_current_limit for
better readability.

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

drivers/regulator/max8997.c

+32 −21
Original line number Original line Diff line number Diff line
@@ -382,7 +382,7 @@ static int max8997_get_voltage_register(struct regulator_dev *rdev, 
	return 0;

	return 0;

}

}





static int max8997_get_voltage(struct regulator_dev *rdev)

static int max8997_get_voltage_sel(struct regulator_dev *rdev)

{

{

	struct max8997_data *max8997 = rdev_get_drvdata(rdev);

	struct max8997_data *max8997 = rdev_get_drvdata(rdev);

	struct i2c_client *i2c = max8997->iodev->i2c;

	struct i2c_client *i2c = max8997->iodev->i2c;
@@ -400,15 +400,7 @@ static int max8997_get_voltage(struct regulator_dev *rdev) 
	val >>= shift;

	val >>= shift;

	val &= mask;

	val &= mask;





	if (rdev->desc && rdev->desc->ops && rdev->desc->ops->list_voltage)

	return val;

		return rdev->desc->ops->list_voltage(rdev, val);



	/*

	 * max8997_list_voltage returns value for any rdev with voltage_map,

	 * which works for "CHARGER" and "CHARGER TOPOFF" that do not have

	 * list_voltage ops (they are current regulators).

	 */

	return max8997_list_voltage(rdev, val);

}

}





static inline int max8997_get_voltage_proper_val(

static inline int max8997_get_voltage_proper_val(
@@ -786,7 +778,7 @@ static struct regulator_ops max8997_ldo_ops = { 
	.is_enabled		= max8997_reg_is_enabled,

	.is_enabled		= max8997_reg_is_enabled,

	.enable			= max8997_reg_enable,

	.enable			= max8997_reg_enable,

	.disable		= max8997_reg_disable,

	.disable		= max8997_reg_disable,

	.get_voltage		= max8997_get_voltage,

	.get_voltage_sel	= max8997_get_voltage_sel,

	.set_voltage		= max8997_set_voltage_ldobuck,

	.set_voltage		= max8997_set_voltage_ldobuck,

	.set_suspend_enable	= max8997_reg_enable_suspend,

	.set_suspend_enable	= max8997_reg_enable_suspend,

	.set_suspend_disable	= max8997_reg_disable_suspend,

	.set_suspend_disable	= max8997_reg_disable_suspend,
@@ -797,7 +789,7 @@ static struct regulator_ops max8997_buck_ops = { 
	.is_enabled		= max8997_reg_is_enabled,

	.is_enabled		= max8997_reg_is_enabled,

	.enable			= max8997_reg_enable,

	.enable			= max8997_reg_enable,

	.disable		= max8997_reg_disable,

	.disable		= max8997_reg_disable,

	.get_voltage		= max8997_get_voltage,

	.get_voltage_sel	= max8997_get_voltage_sel,

	.set_voltage		= max8997_set_voltage_buck,

	.set_voltage		= max8997_set_voltage_buck,

	.set_suspend_enable	= max8997_reg_enable_suspend,

	.set_suspend_enable	= max8997_reg_enable_suspend,

	.set_suspend_disable	= max8997_reg_disable_suspend,

	.set_suspend_disable	= max8997_reg_disable_suspend,
@@ -817,7 +809,7 @@ static struct regulator_ops max8997_safeout_ops = { 
	.is_enabled		= max8997_reg_is_enabled,

	.is_enabled		= max8997_reg_is_enabled,

	.enable			= max8997_reg_enable,

	.enable			= max8997_reg_enable,

	.disable		= max8997_reg_disable,

	.disable		= max8997_reg_disable,

	.get_voltage		= max8997_get_voltage,

	.get_voltage_sel	= max8997_get_voltage_sel,

	.set_voltage		= max8997_set_voltage_safeout,

	.set_voltage		= max8997_set_voltage_safeout,

	.set_suspend_enable	= max8997_reg_enable_suspend,

	.set_suspend_enable	= max8997_reg_enable_suspend,

	.set_suspend_disable	= max8997_reg_disable_suspend,

	.set_suspend_disable	= max8997_reg_disable_suspend,
@@ -825,31 +817,50 @@ static struct regulator_ops max8997_safeout_ops = { 




static struct regulator_ops max8997_fixedstate_ops = {

static struct regulator_ops max8997_fixedstate_ops = {

	.list_voltage		= max8997_list_voltage_charger_cv,

	.list_voltage		= max8997_list_voltage_charger_cv,

	.get_voltage		= max8997_get_voltage,

	.get_voltage_sel	= max8997_get_voltage_sel,

	.set_voltage		= max8997_set_voltage_charger_cv,

	.set_voltage		= max8997_set_voltage_charger_cv,

};

};





static int max8997_set_voltage_ldobuck_wrap(struct regulator_dev *rdev,

static int max8997_set_current_limit(struct regulator_dev *rdev,

		int min_uV, int max_uV)

				     int min_uA, int max_uA)

{

{

	unsigned dummy;

	unsigned dummy;

	int rid = rdev_get_id(rdev);



	if (rid != MAX8997_CHARGER && rid != MAX8997_CHARGER_TOPOFF)

		return -EINVAL;





	return max8997_set_voltage_ldobuck(rdev, min_uV, max_uV, &dummy);

	/* Reuse max8997_set_voltage_ldobuck to set current_limit. */

	return max8997_set_voltage_ldobuck(rdev, min_uA, max_uA, &dummy);

}

}





static int max8997_get_current_limit(struct regulator_dev *rdev)

{

	int sel, rid = rdev_get_id(rdev);



	if (rid != MAX8997_CHARGER && rid != MAX8997_CHARGER_TOPOFF)

		return -EINVAL;



	sel = max8997_get_voltage_sel(rdev);

	if (sel < 0)

		return sel;



	/* Reuse max8997_list_voltage to get current_limit. */

	return max8997_list_voltage(rdev, sel);

}





static struct regulator_ops max8997_charger_ops = {

static struct regulator_ops max8997_charger_ops = {

	.is_enabled		= max8997_reg_is_enabled,

	.is_enabled		= max8997_reg_is_enabled,

	.enable			= max8997_reg_enable,

	.enable			= max8997_reg_enable,

	.disable		= max8997_reg_disable,

	.disable		= max8997_reg_disable,

	.get_current_limit	= max8997_get_voltage,

	.get_current_limit	= max8997_get_current_limit,

	.set_current_limit	= max8997_set_voltage_ldobuck_wrap,

	.set_current_limit	= max8997_set_current_limit,

};

};





static struct regulator_ops max8997_charger_fixedstate_ops = {

static struct regulator_ops max8997_charger_fixedstate_ops = {

	.is_enabled		= max8997_reg_is_enabled,

	.is_enabled		= max8997_reg_is_enabled,

	.get_current_limit	= max8997_get_voltage,

	.get_current_limit	= max8997_get_current_limit,

	.set_current_limit	= max8997_set_voltage_ldobuck_wrap,

	.set_current_limit	= max8997_set_current_limit,

};

};





#define MAX8997_VOLTAGE_REGULATOR(_name, _ops) {\

#define MAX8997_VOLTAGE_REGULATOR(_name, _ops) {\