diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-09-01 23:24:50 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-16 19:12:23 -0400 |
| commit | fdf200290581150f7b69148abf6ca860684cbfbb (patch) | |
| tree | 704fcc316e72e34ffc81dda2bf150ed1aa610bcb | |
| parent | 272b98c6455f00884f0350f775c5342358ebb73f (diff) | |
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) | |||
| 1369 | } | 1369 | } |
| 1370 | EXPORT_SYMBOL_GPL(regmap_field_write); | 1370 | EXPORT_SYMBOL_GPL(regmap_field_write); |
| 1371 | 1371 | ||
| 1372 | /** | ||
| 1373 | * regmap_field_update_bits(): Perform a read/modify/write cycle | ||
| 1374 | * on the register field | ||
| 1375 | * | ||
| 1376 | * @field: Register field to write to | ||
| 1377 | * @mask: Bitmask to change | ||
| 1378 | * @val: Value to be written | ||
| 1379 | * | ||
| 1380 | * A value of zero will be returned on success, a negative errno will | ||
| 1381 | * be returned in error cases. | ||
| 1382 | */ | ||
| 1383 | int regmap_field_update_bits(struct regmap_field *field, unsigned int mask, unsigned int val) | ||
| 1384 | { | ||
| 1385 | mask = (mask << field->shift) & field->mask; | ||
| 1386 | |||
| 1387 | return regmap_update_bits(field->regmap, field->reg, | ||
| 1388 | mask, val << field->shift); | ||
| 1389 | } | ||
| 1390 | EXPORT_SYMBOL_GPL(regmap_field_update_bits); | ||
| 1391 | |||
| 1372 | /* | 1392 | /* |
| 1373 | * regmap_bulk_write(): Write multiple registers to the device | 1393 | * regmap_bulk_write(): Write multiple registers to the device |
| 1374 | * | 1394 | * |
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); | |||
| 448 | 448 | ||
| 449 | int regmap_field_read(struct regmap_field *field, unsigned int *val); | 449 | int regmap_field_read(struct regmap_field *field, unsigned int *val); |
| 450 | int regmap_field_write(struct regmap_field *field, unsigned int val); | 450 | int regmap_field_write(struct regmap_field *field, unsigned int val); |
| 451 | int regmap_field_update_bits(struct regmap_field *field, | ||
| 452 | unsigned int mask, unsigned int val); | ||
| 451 | 453 | ||
| 452 | /** | 454 | /** |
| 453 | * Description of an IRQ for the generic regmap irq_chip. | 455 | * Description of an IRQ for the generic regmap irq_chip. |
