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

Commit cd6dffb4 authored by Mark Brown's avatar Mark Brown
Browse files

regulator: core: Provide standard enable operations for regmap users 



Since the enable(), disable() and is_enabled() operations for most regmap
based regulators come down to reading and updating a single register bit
we can factor out the code and allow these drivers to just define which
bit to update using the enable_reg and enable_mask fields in their desc
and then use operations provided by the core.

As well as the code saving this opens the door to future optimisation of
the bulk operations - if the core can realise that we are updating a
single register for multiple regulators then it should be able to combine
these updates into a single physical operation.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 633b6fcd

drivers/regulator/core.c

+55 −0
Original line number Diff line number Diff line
@@ -1725,6 +1725,61 @@ int regulator_disable_deferred(struct regulator *regulator, int ms) 
}

EXPORT_SYMBOL_GPL(regulator_disable_deferred);



/**

 * regulator_is_enabled_regmap - standard is_enabled() for regmap users

 *

 * @rdev: regulator to operate on

 *

 * Regulators that use regmap for their register I/O can set the

 * enable_reg and enable_mask fields in their descriptor and then use

 * this as their is_enabled operation, saving some code.

 */

int regulator_is_enabled_regmap(struct regulator_dev *rdev)

{

	unsigned int val;

	int ret;



	ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val);

	if (ret != 0)

		return ret;



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

}

EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap);



/**

 * regulator_enable_regmap - standard enable() for regmap users

 *

 * @rdev: regulator to operate on

 *

 * Regulators that use regmap for their register I/O can set the

 * enable_reg and enable_mask fields in their descriptor and then use

 * this as their enable() operation, saving some code.

 */

int regulator_enable_regmap(struct regulator_dev *rdev)

{

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

				  rdev->desc->enable_mask,

				  rdev->desc->enable_mask);

}

EXPORT_SYMBOL_GPL(regulator_enable_regmap);



/**

 * regulator_disable_regmap - standard disable() for regmap users

 *

 * @rdev: regulator to operate on

 *

 * Regulators that use regmap for their register I/O can set the

 * enable_reg and enable_mask fields in their descriptor and then use

 * this as their disable() operation, saving some code.

 */

int regulator_disable_regmap(struct regulator_dev *rdev)

{

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

				  rdev->desc->enable_mask, 0);

}

EXPORT_SYMBOL_GPL(regulator_disable_regmap);



static int _regulator_is_enabled(struct regulator_dev *rdev)

{

	/* If we don't know then assume that the regulator is always on */

include/linux/regulator/driver.h

+7 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ enum regulator_type { 


 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_

 * @vsel_mask: Mask for register bitfield used for selector

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

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

 */

struct regulator_desc {

	const char *name;
@@ -180,6 +182,8 @@ struct regulator_desc { 


	unsigned int vsel_reg;

	unsigned int vsel_mask;

	unsigned int enable_reg;

	unsigned int enable_mask;

};



/**
@@ -258,6 +262,9 @@ int regulator_mode_to_status(unsigned int); 


int regulator_get_voltage_sel_regmap(struct regulator_dev *rdev);

int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel);

int regulator_is_enabled_regmap(struct regulator_dev *rdev);

int regulator_enable_regmap(struct regulator_dev *rdev);

int regulator_disable_regmap(struct regulator_dev *rdev);



void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data);