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

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

regulator: rc5t583: Use regulator_set_voltage_time_sel() 



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

drivers/regulator/rc5t583-regulator.c

+2 −14
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct rc5t583_regulator_info { 


	/* Regulator specific turn-on delay  and voltage settling time*/

	int			enable_uv_per_us;

	int			change_uv_per_us;



	/* Used by regulator core */

	struct regulator_desc	desc;
@@ -66,17 +65,6 @@ static int rc5t583_regulator_enable_time(struct regulator_dev *rdev) 
	return DIV_ROUND_UP(curr_uV, reg->reg_info->enable_uv_per_us);

}



static int rc5t583_set_voltage_time_sel(struct regulator_dev *rdev,

		unsigned int old_selector, unsigned int new_selector)

{

	struct rc5t583_regulator *reg = rdev_get_drvdata(rdev);



	return DIV_ROUND_UP(abs(new_selector - old_selector) *

			    rdev->desc->uV_step,

			    reg->reg_info->change_uv_per_us);

}





static struct regulator_ops rc5t583_ops = {

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,
@@ -86,7 +74,7 @@ static struct regulator_ops rc5t583_ops = { 
	.set_voltage_sel	= regulator_set_voltage_sel_regmap,

	.list_voltage		= regulator_list_voltage_linear,

	.map_voltage		= regulator_map_voltage_linear,

	.set_voltage_time_sel	= rc5t583_set_voltage_time_sel,

	.set_voltage_time_sel	= regulator_set_voltage_time_sel,

};



#define RC5T583_REG(_id, _en_reg, _en_bit, _disc_reg, _disc_bit, \
@@ -96,7 +84,6 @@ static struct regulator_ops rc5t583_ops = { 
	.disc_bit	= _disc_bit,				\

	.deepsleep_reg	= RC5T583_REG_##_id##DAC_DS,		\

	.enable_uv_per_us = _enable_mv * 1000,			\

	.change_uv_per_us = 40 * 1000,				\

	.deepsleep_id	= RC5T583_DS_##_id,			\

	.desc = {						\

		.name = "rc5t583-regulator-"#_id,		\
@@ -111,6 +98,7 @@ static struct regulator_ops rc5t583_ops = { 
		.enable_mask = BIT(_en_bit),			\

		.min_uV	= _min_mv * 1000,			\

		.uV_step = _step_uV,				\

		.ramp_delay = 40 * 1000,			\

	},							\

}