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

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

regulator: core: Allow specify apply_[reg|bit] for regmap based voltage_sel operations 



Some DVM regulators needs to update apply_bit after setting vsel_reg to
initiate voltage change on the output.  This patch adds apply_reg and
apply_bit to struct regulator_desc and update
regulator_set_voltage_sel_regmap() to set apply_bit of apply_reg when
apply_bit is set.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a49f0d1e

drivers/regulator/core.c

+11 −1
Original line number Diff line number Diff line
@@ -2074,10 +2074,20 @@ EXPORT_SYMBOL_GPL(regulator_get_voltage_sel_regmap); 
 */

int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel)

{

	int ret;



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



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

	ret = regmap_update_bits(rdev->regmap, rdev->desc->vsel_reg,

				  rdev->desc->vsel_mask, sel);

	if (ret)

		return ret;



	if (rdev->desc->apply_bit)

		ret = regmap_update_bits(rdev->regmap, rdev->desc->apply_reg,

					 rdev->desc->apply_bit,

					 rdev->desc->apply_bit);

	return ret;

}

EXPORT_SYMBOL_GPL(regulator_set_voltage_sel_regmap);

include/linux/regulator/driver.h

+6 −0
Original line number Diff line number Diff line
@@ -193,6 +193,10 @@ enum regulator_type { 
 *

 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_

 * @vsel_mask: Mask for register bitfield used for selector

 * @apply_reg: Register for initiate voltage change on the output when

 *                using regulator_set_voltage_sel_regmap

 * @apply_bit: Register bitfield used for initiate voltage change on the

 *                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

 *
@@ -218,6 +222,8 @@ struct regulator_desc { 


	unsigned int vsel_reg;

	unsigned int vsel_mask;

	unsigned int apply_reg;

	unsigned int apply_bit;

	unsigned int enable_reg;

	unsigned int enable_mask;

	unsigned int bypass_reg;