diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-09-01 20:24:50 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-17 00:12:23 +0100 |
| commit | fdf200290581150f7b69148abf6ca860684cbfbb (patch) | |
| tree | 704fcc316e72e34ffc81dda2bf150ed1aa610bcb | |
| parent | 272b98c6455f00884f0350f775c5342358ebb73f (diff) | |
| download | linux-stable-fdf200290581150f7b69148abf6ca860684cbfbb.tar.gz linux-stable-fdf200290581150f7b69148abf6ca860684cbfbb.tar.bz2 linux-stable-fdf200290581150f7b69148abf6ca860684cbfbb.zip | |
regmap: add regmap_field_update_bits()
Current regmap_field is supporting read/write functions.
This patch adds new update_bits function for it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/base/regmap/regmap.c | 20 | ||||
| -rw-r--r-- | include/linux/regmap.h | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 7d689a15c500..285afa7470c0 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1369,6 +1369,26 @@ int regmap_field_write(struct regmap_field *field, unsigned int val) } EXPORT_SYMBOL_GPL(regmap_field_write); +/** + * regmap_field_update_bits(): Perform a read/modify/write cycle + * on the register field + * + * @field: Register field to write to + * @mask: Bitmask to change + * @val: Value to be written + * + * A value of zero will be returned on success, a negative errno will + * be returned in error cases. + */ +int regmap_field_update_bits(struct regmap_field *field, unsigned int mask, unsigned int val) +{ + mask = (mask << field->shift) & field->mask; + + return regmap_update_bits(field->regmap, field->reg, + mask, val << field->shift); +} +EXPORT_SYMBOL_GPL(regmap_field_update_bits); + /* * regmap_bulk_write(): Write multiple registers to the device * diff --git a/include/linux/regmap.h b/include/linux/regmap.h index a10380bfbeac..4c8c20a7a75d 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -448,6 +448,8 @@ void devm_regmap_field_free(struct device *dev, struct regmap_field *field); int regmap_field_read(struct regmap_field *field, unsigned int *val); int regmap_field_write(struct regmap_field *field, unsigned int val); +int regmap_field_update_bits(struct regmap_field *field, + unsigned int mask, unsigned int val); /** * Description of an IRQ for the generic regmap irq_chip. |