Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51dcdafc authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: core: Add enable_is_inverted flag to indicate set enable_mask bits to disable 



Add enable_is_inverted flag to indicate set enable_mask bits to disable
when using regulator_enable_regmap and friends APIs.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Reviewed-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0ac682db

drivers/regulator/core.c

+20 −4
Original line number Diff line number Diff line
@@ -1794,6 +1794,9 @@ 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;

}

EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap);
@@ -1809,9 +1812,15 @@ EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap); 
 */

int regulator_enable_regmap(struct regulator_dev *rdev)

{

	unsigned int val;



	if (rdev->desc->enable_is_inverted)

		val = 0;

	else

		val = rdev->desc->enable_mask;



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

				  rdev->desc->enable_mask,

				  rdev->desc->enable_mask);

				  rdev->desc->enable_mask, val);

}

EXPORT_SYMBOL_GPL(regulator_enable_regmap);
@@ -1826,8 +1835,15 @@ EXPORT_SYMBOL_GPL(regulator_enable_regmap); 
 */

int regulator_disable_regmap(struct regulator_dev *rdev)

{

	unsigned int val;



	if (rdev->desc->enable_is_inverted)

		val = rdev->desc->enable_mask;

	else

		val = 0;



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

				  rdev->desc->enable_mask, 0);

				  rdev->desc->enable_mask, val);

}

EXPORT_SYMBOL_GPL(regulator_disable_regmap);

include/linux/regulator/driver.h

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ 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_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

 *
@@ -228,6 +230,7 @@ struct regulator_desc { 
	unsigned int apply_bit;

	unsigned int enable_reg;

	unsigned int enable_mask;

	bool enable_is_inverted;

	unsigned int bypass_reg;

	unsigned int bypass_mask;