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

regulator: rk808: Convert to use regulator_set_ramp_delay_regmap 



Use regulator_set_ramp_delay_regmap instead of open-coded.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Message-Id: <20210525141203.2562884-1-axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5c42903e

drivers/regulator/rk808-regulator.c

+51 −65
Original line number Diff line number Diff line
@@ -158,13 +158,6 @@ struct rk808_regulator_data { 
	struct gpio_desc *dvs_gpio[2];

};



static const int rk808_buck_config_regs[] = {

	RK808_BUCK1_CONFIG_REG,

	RK808_BUCK2_CONFIG_REG,

	RK808_BUCK3_CONFIG_REG,

	RK808_BUCK4_CONFIG_REG,

};



static const struct linear_range rk808_ldo3_voltage_ranges[] = {

	REGULATOR_LINEAR_RANGE(800000, 0, 13, 100000),

	REGULATOR_LINEAR_RANGE(2500000, 15, 15, 0),
@@ -215,6 +208,15 @@ static const struct linear_range rk817_buck3_voltage_ranges[] = { 
			       RK817_BUCK3_SEL_CNT, RK817_BUCK1_STP1),

};



static const unsigned int rk808_buck1_2_ramp_table[] = {

	2000, 4000, 6000, 10000

};



/* RK817 RK809 */

static const unsigned int rk817_buck1_4_ramp_table[] = {

	3000, 6300, 12500, 25000

};



static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev)

{

	struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev);
@@ -340,62 +342,6 @@ static int rk808_buck1_2_set_voltage_time_sel(struct regulator_dev *rdev, 
	return regulator_set_voltage_time_sel(rdev, old_selector, new_selector);

}



static int rk808_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)

{

	unsigned int ramp_value = RK808_RAMP_RATE_10MV_PER_US;

	unsigned int reg = rk808_buck_config_regs[rdev_get_id(rdev)];



	switch (ramp_delay) {

	case 1 ... 2000:

		ramp_value = RK808_RAMP_RATE_2MV_PER_US;

		break;

	case 2001 ... 4000:

		ramp_value = RK808_RAMP_RATE_4MV_PER_US;

		break;

	case 4001 ... 6000:

		ramp_value = RK808_RAMP_RATE_6MV_PER_US;

		break;

	case 6001 ... 10000:

		break;

	default:

		pr_warn("%s ramp_delay: %d not supported, setting 10000\n",

			rdev->desc->name, ramp_delay);

	}



	return regmap_update_bits(rdev->regmap, reg,

				  RK808_RAMP_RATE_MASK, ramp_value);

}



/*

 * RK817 RK809

 */

static int rk817_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)

{

	unsigned int ramp_value = RK817_RAMP_RATE_25MV_PER_US;

	unsigned int reg = RK817_BUCK_CONFIG_REG(rdev_get_id(rdev));



	switch (ramp_delay) {

	case 0 ... 3000:

		ramp_value = RK817_RAMP_RATE_3MV_PER_US;

		break;

	case 3001 ... 6300:

		ramp_value = RK817_RAMP_RATE_6_3MV_PER_US;

		break;

	case 6301 ... 12500:

		ramp_value = RK817_RAMP_RATE_12_5MV_PER_US;

		break;

	case 12501 ... 25000:

		break;

	default:

		dev_warn(&rdev->dev,

			 "%s ramp_delay: %d not supported, setting 25000\n",

			 rdev->desc->name, ramp_delay);

	}



	return regmap_update_bits(rdev->regmap, reg,

				  RK817_RAMP_RATE_MASK, ramp_value);

}



static int rk808_set_suspend_voltage(struct regulator_dev *rdev, int uv)

{

	unsigned int reg;
@@ -625,7 +571,7 @@ static const struct regulator_ops rk808_buck1_2_ops = { 
	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.is_enabled		= regulator_is_enabled_regmap,

	.set_ramp_delay		= rk808_set_ramp_delay,

	.set_ramp_delay		= regulator_set_ramp_delay_regmap,

	.set_suspend_voltage	= rk808_set_suspend_voltage,

	.set_suspend_enable	= rk808_set_suspend_enable,

	.set_suspend_disable	= rk808_set_suspend_disable,
@@ -722,7 +668,7 @@ static const struct regulator_ops rk817_buck_ops_range = { 
	.set_mode		= rk8xx_set_mode,

	.get_mode		= rk8xx_get_mode,

	.set_suspend_mode	= rk8xx_set_suspend_mode,

	.set_ramp_delay		= rk817_set_ramp_delay,

	.set_ramp_delay		= regulator_set_ramp_delay_regmap,

	.set_suspend_voltage	= rk808_set_suspend_voltage_range,

	.set_suspend_enable	= rk817_set_suspend_enable,

	.set_suspend_disable	= rk817_set_suspend_disable,
@@ -814,6 +760,10 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_BUCK_VSEL_MASK,

		.enable_reg = RK808_DCDC_EN_REG,

		.enable_mask = BIT(0),

		.ramp_reg = RK808_BUCK1_CONFIG_REG,

		.ramp_mask = RK808_RAMP_RATE_MASK,

		.ramp_delay_table = rk808_buck1_2_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk808_buck1_2_ramp_table),

		.owner = THIS_MODULE,

	}, {

		.name = "DCDC_REG2",
@@ -830,6 +780,10 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_BUCK_VSEL_MASK,

		.enable_reg = RK808_DCDC_EN_REG,

		.enable_mask = BIT(1),

		.ramp_reg = RK808_BUCK2_CONFIG_REG,

		.ramp_mask = RK808_RAMP_RATE_MASK,

		.ramp_delay_table = rk808_buck1_2_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk808_buck1_2_ramp_table),

		.owner = THIS_MODULE,

	}, {

		.name = "DCDC_REG3",
@@ -910,6 +864,10 @@ static const struct regulator_desc rk809_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC1),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC1),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC1),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC1),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	}, {
@@ -929,6 +887,10 @@ static const struct regulator_desc rk809_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC2),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC2),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC2),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC2),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	}, {
@@ -948,6 +910,10 @@ static const struct regulator_desc rk809_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC3),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC3),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC3),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC3),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	}, {
@@ -967,6 +933,10 @@ static const struct regulator_desc rk809_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC4),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC4),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC4),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC4),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	},
@@ -1052,6 +1022,10 @@ static const struct regulator_desc rk817_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC1),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC1),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC1),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC1),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	}, {
@@ -1071,6 +1045,10 @@ static const struct regulator_desc rk817_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC2),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC2),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC2),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC2),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	}, {
@@ -1090,6 +1068,10 @@ static const struct regulator_desc rk817_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC3),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC3),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC3),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC3),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	}, {
@@ -1109,6 +1091,10 @@ static const struct regulator_desc rk817_reg[] = { 
		.enable_mask = ENABLE_MASK(RK817_ID_DCDC4),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC4),

		.disable_val = DISABLE_VAL(RK817_ID_DCDC4),

		.ramp_reg = RK817_BUCK_CONFIG_REG(RK817_ID_DCDC4),

		.ramp_mask = RK817_RAMP_RATE_MASK,

		.ramp_delay_table = rk817_buck1_4_ramp_table,

		.n_ramp_values = ARRAY_SIZE(rk817_buck1_4_ramp_table),

		.of_map_mode = rk8xx_regulator_of_map_mode,

		.owner = THIS_MODULE,

	},