diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 52b7d88..67d95fe 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -137,6 +137,35 @@ } /** + * regmap_update_bits() - Perform a read/modify/write cycle on a register + * + * @map: Register map to update + * @reg: Register to update + * @mask: Bitmask to change + * @val: New value for bitmask + * + * Returns zero for success, a negative number on error. + */ +int regmap_update_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val) +{ + int ret; + unsigned int tmp, orig; + + ret = regmap_read(map, reg, &orig); + if (ret != 0) + return ret; + + tmp = orig & ~mask; + tmp |= val & mask; + + if (tmp != orig) + ret = regmap_write(map, reg, tmp); + + return ret; +} + +/** * regmap_write_bits - write bits of a register in a map * * @map: The map diff --git a/include/regmap.h b/include/regmap.h index 9675a17..09b7b57 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -62,6 +62,7 @@ int regmap_write_bits(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val); - +int regmap_update_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val); #endif /* __REGMAP_H */