Unverified Commit 269cb04b authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Mark Brown
Browse files

regulator: Use bitfield values for range selectors 



Right now the regulator helpers expect raw register values for the range
selectors. This is different from the voltage selectors, which are
normalized as bitfield values. This leads to a bit of confusion. Also,
raw values are harder to copy from datasheets or match up with them,
as datasheets will typically have bitfield values.

Make the helpers expect bitfield values, and convert existing users. The
field in regulator_desc is renamed to |linear_range_selectors_bitfield|.
This is intended to cause drivers added in the same merge window and
out-of-tree drivers using the incorrect variable and values to break,
preventing incorrect values being used on actual hardware and potentially
producing magic smoke.

Also include bitops.h explicitly for ffs(), and reorder the header include
statements. While at it, also replace module.h with export.h, since the
only use is EXPORT_SYMBOL_GPL.

Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20230714081408.274567-1-wenst@chromium.org


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

drivers/regulator/atc260x-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static const struct linear_range atc2609a_ldo_voltage_ranges1[] = { 
};



static const unsigned int atc260x_ldo_voltage_range_sel[] = {

	0x0, 0x20,

	0x0, 0x1,

};



static int atc260x_dcdc_set_voltage_time_sel(struct regulator_dev *rdev,
@@ -428,7 +428,7 @@ enum atc2609a_reg_ids { 
	.vsel_mask = GENMASK(4, 1), \

	.vsel_range_reg = ATC2609A_PMU_LDO##num##_CTL0, \

	.vsel_range_mask = BIT(5), \

	.linear_range_selectors = atc260x_ldo_voltage_range_sel, \

	.linear_range_selectors_bitfield = atc260x_ldo_voltage_range_sel, \

	.enable_reg = ATC2609A_PMU_LDO##num##_CTL0, \

	.enable_mask = BIT(0), \

	.enable_time = 2000, \

drivers/regulator/bd718x7-regulator.c

+11 −11
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static const struct linear_range bd71837_buck5_volts[] = { 
 * and 0x1 for last 3 ranges.

 */

static const unsigned int bd71837_buck5_volt_range_sel[] = {

	0x0, 0x0, 0x0, 0x80, 0x80, 0x80

	0x0, 0x0, 0x0, 0x1, 0x1, 0x1

};



/*
@@ -309,7 +309,7 @@ static const struct linear_range bd71847_buck3_volts[] = { 
};



static const unsigned int bd71847_buck3_volt_range_sel[] = {

	0x0, 0x0, 0x0, 0x40, 0x80, 0x80, 0x80

	0x0, 0x0, 0x0, 0x1, 0x2, 0x2, 0x2

};



static const struct linear_range bd71847_buck4_volts[] = {
@@ -317,7 +317,7 @@ static const struct linear_range bd71847_buck4_volts[] = { 
	REGULATOR_LINEAR_RANGE(2600000, 0x00, 0x03, 100000),

};



static const unsigned int bd71847_buck4_volt_range_sel[] = { 0x0, 0x40 };

static const unsigned int bd71847_buck4_volt_range_sel[] = { 0x0, 0x1 };



/*

 * BUCK6
@@ -360,7 +360,7 @@ static const struct linear_range bd718xx_ldo1_volts[] = { 
	REGULATOR_LINEAR_RANGE(1600000, 0x00, 0x03, 100000),

};



static const unsigned int bd718xx_ldo1_volt_range_sel[] = { 0x0, 0x20 };

static const unsigned int bd718xx_ldo1_volt_range_sel[] = { 0x0, 0x1 };



/*

 * LDO2
@@ -403,7 +403,7 @@ static const struct linear_range bd71847_ldo5_volts[] = { 
	REGULATOR_LINEAR_RANGE(800000, 0x00, 0x0F, 100000),

};



static const unsigned int bd71847_ldo5_volt_range_sel[] = { 0x0, 0x20 };

static const unsigned int bd71847_ldo5_volt_range_sel[] = { 0x0, 0x1 };



/*

 * LDO6
@@ -817,7 +817,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { 
			.vsel_mask = BD718XX_1ST_NODVS_BUCK_MASK,

			.vsel_range_reg = BD718XX_REG_1ST_NODVS_BUCK_VOLT,

			.vsel_range_mask = BD71847_BUCK3_RANGE_MASK,

			.linear_range_selectors = bd71847_buck3_volt_range_sel,

			.linear_range_selectors_bitfield = bd71847_buck3_volt_range_sel,

			.enable_reg = BD718XX_REG_1ST_NODVS_BUCK_CTRL,

			.enable_mask = BD718XX_BUCK_EN,

			.enable_time = BD71847_BUCK3_STARTUP_TIME,
@@ -845,7 +845,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { 
			.vsel_mask = BD71847_BUCK4_MASK,

			.vsel_range_reg = BD718XX_REG_2ND_NODVS_BUCK_VOLT,

			.vsel_range_mask = BD71847_BUCK4_RANGE_MASK,

			.linear_range_selectors = bd71847_buck4_volt_range_sel,

			.linear_range_selectors_bitfield = bd71847_buck4_volt_range_sel,

			.enable_mask = BD718XX_BUCK_EN,

			.enable_time = BD71847_BUCK4_STARTUP_TIME,

			.owner = THIS_MODULE,
@@ -916,7 +916,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { 
			.vsel_mask = BD718XX_LDO1_MASK,

			.vsel_range_reg = BD718XX_REG_LDO1_VOLT,

			.vsel_range_mask = BD718XX_LDO1_RANGE_MASK,

			.linear_range_selectors = bd718xx_ldo1_volt_range_sel,

			.linear_range_selectors_bitfield = bd718xx_ldo1_volt_range_sel,

			.enable_reg = BD718XX_REG_LDO1_VOLT,

			.enable_mask = BD718XX_LDO_EN,

			.enable_time = BD71847_LDO1_STARTUP_TIME,
@@ -1010,7 +1010,7 @@ static struct bd718xx_regulator_data bd71847_regulators[] = { 
			.vsel_mask = BD71847_LDO5_MASK,

			.vsel_range_reg = BD718XX_REG_LDO5_VOLT,

			.vsel_range_mask = BD71847_LDO5_RANGE_MASK,

			.linear_range_selectors = bd71847_ldo5_volt_range_sel,

			.linear_range_selectors_bitfield = bd71847_ldo5_volt_range_sel,

			.enable_reg = BD718XX_REG_LDO5_VOLT,

			.enable_mask = BD718XX_LDO_EN,

			.enable_time = BD71847_LDO5_STARTUP_TIME,
@@ -1232,7 +1232,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { 
			.vsel_mask = BD71837_BUCK5_MASK,

			.vsel_range_reg = BD718XX_REG_1ST_NODVS_BUCK_VOLT,

			.vsel_range_mask = BD71837_BUCK5_RANGE_MASK,

			.linear_range_selectors = bd71837_buck5_volt_range_sel,

			.linear_range_selectors_bitfield = bd71837_buck5_volt_range_sel,

			.enable_reg = BD718XX_REG_1ST_NODVS_BUCK_CTRL,

			.enable_mask = BD718XX_BUCK_EN,

			.enable_time = BD71837_BUCK5_STARTUP_TIME,
@@ -1328,7 +1328,7 @@ static struct bd718xx_regulator_data bd71837_regulators[] = { 
			.vsel_mask = BD718XX_LDO1_MASK,

			.vsel_range_reg = BD718XX_REG_LDO1_VOLT,

			.vsel_range_mask = BD718XX_LDO1_RANGE_MASK,

			.linear_range_selectors = bd718xx_ldo1_volt_range_sel,

			.linear_range_selectors_bitfield = bd718xx_ldo1_volt_range_sel,

			.enable_reg = BD718XX_REG_LDO1_VOLT,

			.enable_mask = BD718XX_LDO_EN,

			.enable_time = BD71837_LDO1_STARTUP_TIME,

drivers/regulator/helpers.c

+9 −6
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ 
// Copyright 2007, 2008 Wolfson Microelectronics PLC.

// Copyright 2008 SlimLogic Ltd.



#include <linux/kernel.h>

#include <linux/err.h>

#include <linux/bitops.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/regmap.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/driver.h>

#include <linux/module.h>



#include "internal.h"
@@ -104,13 +105,14 @@ static int regulator_range_selector_to_index(struct regulator_dev *rdev, 
{

	int i;



	if (!rdev->desc->linear_range_selectors)

	if (!rdev->desc->linear_range_selectors_bitfield)

		return -EINVAL;



	rval &= rdev->desc->vsel_range_mask;

	rval >>= ffs(rdev->desc->vsel_range_mask) - 1;



	for (i = 0; i < rdev->desc->n_linear_ranges; i++) {

		if (rdev->desc->linear_range_selectors[i] == rval)

		if (rdev->desc->linear_range_selectors_bitfield[i] == rval)

			return i;

	}

	return -EINVAL;
@@ -194,7 +196,8 @@ int regulator_set_voltage_sel_pickable_regmap(struct regulator_dev *rdev, 
	sel <<= ffs(rdev->desc->vsel_mask) - 1;

	sel += rdev->desc->linear_ranges[i].min_sel;



	range = rdev->desc->linear_range_selectors[i];

	range = rdev->desc->linear_range_selectors_bitfield[i];

	range <<= ffs(rdev->desc->vsel_mask) - 1;



	if (rdev->desc->vsel_reg == rdev->desc->vsel_range_reg) {

		ret = regmap_update_bits(rdev->regmap,

drivers/regulator/max77541-regulator.c

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static const struct linear_range max77541_buck_ranges[] = { 
};



static const unsigned int max77541_buck_volt_range_sel[] = {

	0x00, 0x00, 0x40, 0x40, 0x80, 0x80,

	0x0, 0x0, 0x1, 0x1, 0x2, 0x2,

};



enum max77541_regulators {
@@ -67,7 +67,7 @@ enum max77541_regulators { 
		.vsel_mask = MAX77541_BITS_MX_VOUT,			\

		.vsel_range_reg = MAX77541_REG_M ## _id ## _CFG1,	\

		.vsel_range_mask = MAX77541_BITS_MX_CFG1_RNG,		\

		.linear_range_selectors = max77541_buck_volt_range_sel, \

		.linear_range_selectors_bitfield = max77541_buck_volt_range_sel, \

		.owner = THIS_MODULE,					\

	}
@@ -86,7 +86,7 @@ enum max77541_regulators { 
		.vsel_mask = MAX77541_BITS_MX_VOUT,			\

		.vsel_range_reg = MAX77541_REG_M ## _id ## _CFG1,	\

		.vsel_range_mask = MAX77541_BITS_MX_CFG1_RNG,		\

		.linear_range_selectors = max77541_buck_volt_range_sel, \

		.linear_range_selectors_bitfield = max77541_buck_volt_range_sel, \

		.owner = THIS_MODULE,					\

	}

drivers/regulator/max77650-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static struct max77650_regulator_desc max77651_SBB1_desc = { 
		.supply_name		= "in-sbb1",

		.id			= MAX77650_REGULATOR_ID_SBB1,

		.ops			= &max77651_SBB1_regulator_ops,

		.linear_range_selectors	= max77651_sbb1_volt_range_sel,

		.linear_range_selectors_bitfield	= max77651_sbb1_volt_range_sel,

		.linear_ranges		= max77651_sbb1_volt_ranges,

		.n_linear_ranges	= ARRAY_SIZE(max77651_sbb1_volt_ranges),

		.n_voltages		= 58,