Commit ca5d1b35 authored by Carlo Caione's avatar Carlo Caione Committed by Mark Brown
Browse files

regulator: helpers: Modify helpers enabling multi-bit control 



This patch extends the regulator helpers to account for device that use
multiple bits for control when using regmap enable/disable/bypass ops.

The actual regulator helpers wrongly assume that the regulator control
is always performed using single bits, using in the regulator_desc
struct only two parameters *_reg and *_mask defining register and mask
for control.

This patch extends this struct and introduces the helpers to take into
account devices where control is performed using multiple bits and
specific multi-bit values are used for enabling/disabling/bypassing the
regulator.

Signed-off-by: default avatarCarlo Caione <carlo@caione.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

drivers/regulator/helpers.c

+32 −16
Original line number Diff line number Diff line
@@ -37,10 +37,17 @@ int regulator_is_enabled_regmap(struct regulator_dev *rdev) 
	if (ret != 0)

		return ret;



	if (rdev->desc->enable_is_inverted)

		return (val & rdev->desc->enable_mask) == 0;

	else

		return (val & rdev->desc->enable_mask) != 0;

	val &= rdev->desc->enable_mask;



	if (rdev->desc->enable_is_inverted) {

		if (rdev->desc->enable_val)

			return val != rdev->desc->enable_val;

		return val == 0;

	} else {

		if (rdev->desc->enable_val)

			return val == rdev->desc->enable_val;

		return val != 0;

	}

}

EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap);
@@ -57,10 +64,13 @@ int regulator_enable_regmap(struct regulator_dev *rdev) 
{

	unsigned int val;



	if (rdev->desc->enable_is_inverted)

		val = 0;

	else

	if (rdev->desc->enable_is_inverted) {

		val = rdev->desc->disable_val;

	} else {

		val = rdev->desc->enable_val;

		if (!val)

			val = rdev->desc->enable_mask;

	}



	return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				  rdev->desc->enable_mask, val);
@@ -80,10 +90,13 @@ int regulator_disable_regmap(struct regulator_dev *rdev) 
{

	unsigned int val;



	if (rdev->desc->enable_is_inverted)

	if (rdev->desc->enable_is_inverted) {

		val = rdev->desc->enable_val;

		if (!val)

			val = rdev->desc->enable_mask;

	else

		val = 0;

	} else {

		val = rdev->desc->disable_val;

	}



	return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,

				  rdev->desc->enable_mask, val);
@@ -419,10 +432,13 @@ int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable) 
{

	unsigned int val;



	if (enable)

	if (enable) {

		val = rdev->desc->bypass_val_on;

		if (!val)

			val = rdev->desc->bypass_mask;

	else

		val = 0;

	} else {

		val = rdev->desc->bypass_val_off;

	}



	return regmap_update_bits(rdev->regmap, rdev->desc->bypass_reg,

				  rdev->desc->bypass_mask, val);

include/linux/regulator/driver.h

+8 −0
Original line number Diff line number Diff line
@@ -228,10 +228,14 @@ enum regulator_type { 
 *                output when using regulator_set_voltage_sel_regmap

 * @enable_reg: Register for control when using regmap enable/disable ops

 * @enable_mask: Mask for control when using regmap enable/disable ops

 * @enable_val: Enabling value for control when using regmap enable/disable ops

 * @disable_val: Disabling value for control when using regmap enable/disable ops

 * @enable_is_inverted: A flag to indicate set enable_mask bits to disable

 *                      when using regulator_enable_regmap and friends APIs.

 * @bypass_reg: Register for control when using regmap set_bypass

 * @bypass_mask: Mask for control when using regmap set_bypass

 * @bypass_val_on: Enabling value for control when using regmap set_bypass

 * @bypass_val_off: Disabling value for control when using regmap set_bypass

 *

 * @enable_time: Time taken for initial enable of regulator (in uS).

 */
@@ -263,9 +267,13 @@ struct regulator_desc { 
	unsigned int apply_bit;

	unsigned int enable_reg;

	unsigned int enable_mask;

	unsigned int enable_val;

	unsigned int disable_val;

	bool enable_is_inverted;

	unsigned int bypass_reg;

	unsigned int bypass_mask;

	unsigned int bypass_val_on;

	unsigned int bypass_val_off;



	unsigned int enable_time;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE