Unverified Commit 6eb891cf authored by ChiYuan Huang's avatar ChiYuan Huang Committed by Mark Brown
Browse files

regulator: rt5033: Use linear ranges to map all voltage selection 



Instead of linear mapping, Use linear range to map all voltage selection.

Signed-off-by: default avatarChiYuan Huang <cy_huang@richtek.com>
Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/1625553939-9109-1-git-send-email-u0084500@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e301df76

drivers/regulator/rt5033-regulator.c

+15 −6
Original line number Original line Diff line number Diff line
@@ -13,6 +13,16 @@ 
#include <linux/mfd/rt5033-private.h>

#include <linux/mfd/rt5033-private.h>

#include <linux/regulator/of_regulator.h>

#include <linux/regulator/of_regulator.h>





static const struct linear_range rt5033_buck_ranges[] = {

	REGULATOR_LINEAR_RANGE(1000000, 0, 20, 100000),

	REGULATOR_LINEAR_RANGE(3000000, 21, 31, 0),

};



static const struct linear_range rt5033_ldo_ranges[] = {

	REGULATOR_LINEAR_RANGE(1200000, 0, 18, 100000),

	REGULATOR_LINEAR_RANGE(3000000, 19, 31, 0),

};



static const struct regulator_ops rt5033_safe_ldo_ops = {

static const struct regulator_ops rt5033_safe_ldo_ops = {

	.is_enabled		= regulator_is_enabled_regmap,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.enable			= regulator_enable_regmap,
@@ -24,8 +34,7 @@ static const struct regulator_ops rt5033_buck_ops = { 
	.is_enabled		= regulator_is_enabled_regmap,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.disable		= regulator_disable_regmap,

	.list_voltage		= regulator_list_voltage_linear,

	.list_voltage		= regulator_list_voltage_linear_range,

	.map_voltage		= regulator_map_voltage_linear,

	.get_voltage_sel	= regulator_get_voltage_sel_regmap,

	.get_voltage_sel	= regulator_get_voltage_sel_regmap,

	.set_voltage_sel	= regulator_set_voltage_sel_regmap,

	.set_voltage_sel	= regulator_set_voltage_sel_regmap,

};

};
@@ -40,8 +49,8 @@ static const struct regulator_desc rt5033_supported_regulators[] = { 
		.type		= REGULATOR_VOLTAGE,

		.type		= REGULATOR_VOLTAGE,

		.owner		= THIS_MODULE,

		.owner		= THIS_MODULE,

		.n_voltages	= RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM,

		.n_voltages	= RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM,

		.min_uV		= RT5033_REGULATOR_BUCK_VOLTAGE_MIN,

		.linear_ranges	= rt5033_buck_ranges,

		.uV_step	= RT5033_REGULATOR_BUCK_VOLTAGE_STEP,

		.n_linear_ranges = ARRAY_SIZE(rt5033_buck_ranges),

		.enable_reg	= RT5033_REG_CTRL,

		.enable_reg	= RT5033_REG_CTRL,

		.enable_mask	= RT5033_CTRL_EN_BUCK_MASK,

		.enable_mask	= RT5033_CTRL_EN_BUCK_MASK,

		.vsel_reg	= RT5033_REG_BUCK_CTRL,

		.vsel_reg	= RT5033_REG_BUCK_CTRL,
@@ -56,8 +65,8 @@ static const struct regulator_desc rt5033_supported_regulators[] = { 
		.type		= REGULATOR_VOLTAGE,

		.type		= REGULATOR_VOLTAGE,

		.owner		= THIS_MODULE,

		.owner		= THIS_MODULE,

		.n_voltages	= RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM,

		.n_voltages	= RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM,

		.min_uV		= RT5033_REGULATOR_LDO_VOLTAGE_MIN,

		.linear_ranges	= rt5033_ldo_ranges,

		.uV_step	= RT5033_REGULATOR_LDO_VOLTAGE_STEP,

		.n_linear_ranges = ARRAY_SIZE(rt5033_ldo_ranges),

		.enable_reg	= RT5033_REG_CTRL,

		.enable_reg	= RT5033_REG_CTRL,

		.enable_mask	= RT5033_CTRL_EN_LDO_MASK,

		.enable_mask	= RT5033_CTRL_EN_LDO_MASK,

		.vsel_reg	= RT5033_REG_LDO_CTRL,

		.vsel_reg	= RT5033_REG_LDO_CTRL,

include/linux/mfd/rt5033-private.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -200,13 +200,13 @@ enum rt5033_reg { 
#define RT5033_REGULATOR_BUCK_VOLTAGE_MIN		1000000U

#define RT5033_REGULATOR_BUCK_VOLTAGE_MIN		1000000U

#define RT5033_REGULATOR_BUCK_VOLTAGE_MAX		3000000U

#define RT5033_REGULATOR_BUCK_VOLTAGE_MAX		3000000U

#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP		100000U

#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP		100000U

#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM		21

#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM		32





/* RT5033 regulator LDO output voltage uV */

/* RT5033 regulator LDO output voltage uV */

#define RT5033_REGULATOR_LDO_VOLTAGE_MIN		1200000U

#define RT5033_REGULATOR_LDO_VOLTAGE_MIN		1200000U

#define RT5033_REGULATOR_LDO_VOLTAGE_MAX		3000000U

#define RT5033_REGULATOR_LDO_VOLTAGE_MAX		3000000U

#define RT5033_REGULATOR_LDO_VOLTAGE_STEP		100000U

#define RT5033_REGULATOR_LDO_VOLTAGE_STEP		100000U

#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM		19

#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM		32





/* RT5033 regulator SAFE LDO output voltage uV */

/* RT5033 regulator SAFE LDO output voltage uV */

#define RT5033_REGULATOR_SAFE_LDO_VOLTAGE		4900000U

#define RT5033_REGULATOR_SAFE_LDO_VOLTAGE		4900000U