aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/base/regmap/regmap.c20
-rw-r--r--include/linux/regmap.h2
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}
1370EXPORT_SYMBOL_GPL(regmap_field_write); 1370EXPORT_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 */
1383int 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}
1390EXPORT_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
449int regmap_field_read(struct regmap_field *field, unsigned int *val); 449int regmap_field_read(struct regmap_field *field, unsigned int *val);
450int regmap_field_write(struct regmap_field *field, unsigned int val); 450int regmap_field_write(struct regmap_field *field, unsigned int val);
451int 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.