Unverified Commit 35a93349 authored by Adrien Grassein's avatar Adrien Grassein Committed by Mark Brown
Browse files

regulator: pf8x00: use linear range for buck 1-6 



Use a linear range to describe the voltages of the
bucks 1-6 instead of listing it one by one (via a macro)

Signed-off-by: default avatarAdrien Grassein <adrien.grassein@gmail.com>
Link: https://lore.kernel.org/r/20210114174714.122561-6-adrien.grassein@gmail.com


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

drivers/regulator/pf8x00-regulator.c

+51 −32
Original line number Diff line number Diff line
@@ -154,35 +154,11 @@ static const unsigned int pf8x00_sw_current_table[] = { 
	2100000, 2600000, 3000000, 4500000,

};



#define SWV(i)		(6250 * i + 400000)

#define SWV_LINE(i)	SWV(i*8+0), SWV(i*8+1), SWV(i*8+2), SWV(i*8+3), \

			SWV(i*8+4), SWV(i*8+5), SWV(i*8+6), SWV(i*8+7)



/* Output: 0.4V to 1.8V */

static const int pf8x00_sw1_to_6_voltages[] = {

	SWV_LINE(0),

	SWV_LINE(1),

	SWV_LINE(2),

	SWV_LINE(3),

	SWV_LINE(4),

	SWV_LINE(5),

	SWV_LINE(6),

	SWV_LINE(7),

	SWV_LINE(8),

	SWV_LINE(9),

	SWV_LINE(10),

	SWV_LINE(11),

	SWV_LINE(12),

	SWV_LINE(13),

	SWV_LINE(14),

	SWV_LINE(15),

	SWV_LINE(16),

	SWV_LINE(17),

	SWV_LINE(18),

	SWV_LINE(19),

	SWV_LINE(20),

	SWV_LINE(21),

	1500000, 1800000,

#define PF8XOO_SW1_6_VOLTAGE_NUM 0xB2

static const struct linear_range pf8x00_sw1_to_6_voltages[] = {

	REGULATOR_LINEAR_RANGE(400000, 0x00, 0xB0, 6250),

	REGULATOR_LINEAR_RANGE(1800000, 0xB1, 0xB1, 0),

};



/* Output: 1.0V to 4.1V */
@@ -296,7 +272,19 @@ static const struct regulator_ops pf8x00_ldo_ops = { 
	.get_voltage_sel = regulator_get_voltage_sel_regmap,

};



static const struct regulator_ops pf8x00_buck_ops = {



static const struct regulator_ops pf8x00_buck1_6_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,

	.list_voltage = regulator_list_voltage_linear_range,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.get_current_limit = regulator_get_current_limit_regmap,

	.set_current_limit = regulator_set_current_limit_regmap,

};



static const struct regulator_ops pf8x00_buck7_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,
@@ -345,11 +333,41 @@ static const struct regulator_ops pf8x00_vsnvs_ops = { 
			.of_match = _name,			\

			.regulators_node = "regulators",	\

			.of_parse_cb = pf8x00_of_parse_cb,	\

			.n_voltages = ARRAY_SIZE(voltages),	\

			.ops = &pf8x00_buck_ops,		\

			.n_voltages = PF8XOO_SW1_6_VOLTAGE_NUM,	\

			.ops = &pf8x00_buck1_6_ops,		\

			.type = REGULATOR_VOLTAGE,		\

			.id = PF8X00_BUCK ## _id,		\

			.owner = THIS_MODULE,			\

			.linear_ranges = pf8x00_sw1_to_6_voltages, \

			.n_linear_ranges = \

				ARRAY_SIZE(pf8x00_sw1_to_6_voltages), \

			.vsel_reg = (base) + SW_RUN_VOLT,	\

			.vsel_mask = 0xff,			\

			.curr_table = pf8x00_sw_current_table, \

			.n_current_limits = \

				ARRAY_SIZE(pf8x00_sw_current_table), \

			.csel_reg = (base) + SW_CONFIG2,	\

			.csel_mask = PF8X00_SWXILIM_MASK,	\

			.enable_reg = (base) + SW_MODE1,	\

			.enable_val = 0x3,			\

			.disable_val = 0x0,			\

			.enable_mask = 0x3,			\

			.enable_time = 500,			\

		},						\

	}



#define PF8X00BUCK7(_name, base, voltages)			\

	[PF8X00_BUCK7] = {				\

		.desc = {					\

			.name = _name,				\

			.of_match = _name,			\

			.regulators_node = "regulators",	\

			.of_parse_cb = pf8x00_of_parse_cb,	\

			.n_voltages = ARRAY_SIZE(voltages),	\

			.ops = &pf8x00_buck7_ops,		\

			.type = REGULATOR_VOLTAGE,		\

			.id = PF8X00_BUCK7,		\

			.owner = THIS_MODULE,			\

			.volt_table = voltages,			\

			.vsel_reg = (base) + SW_RUN_VOLT,	\

			.vsel_mask = 0xff,			\
@@ -366,6 +384,7 @@ static const struct regulator_ops pf8x00_vsnvs_ops = { 
		},						\

	}





#define PF8X00VSNVS(_name, base, voltages)			\

	[PF8X00_VSNVS] = {					\

		.desc = {					\
@@ -394,7 +413,7 @@ static struct pf8x00_regulator pf8x00_regulators_data[PF8X00_MAX_REGULATORS] = { 
	PF8X00BUCK(4, "buck4", PF8X00_SW_BASE(PF8X00_BUCK4), pf8x00_sw1_to_6_voltages),

	PF8X00BUCK(5, "buck5", PF8X00_SW_BASE(PF8X00_BUCK5), pf8x00_sw1_to_6_voltages),

	PF8X00BUCK(6, "buck6", PF8X00_SW_BASE(PF8X00_BUCK6), pf8x00_sw1_to_6_voltages),

	PF8X00BUCK(7, "buck7", PF8X00_SW_BASE(PF8X00_BUCK7), pf8x00_sw7_voltages),

	PF8X00BUCK7("buck7", PF8X00_SW_BASE(PF8X00_BUCK7), pf8x00_sw7_voltages),

	PF8X00VSNVS("vsnvs", PF8X00_VSNVS_CONFIG1, pf8x00_vsnvs_voltages),

};