diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-10 11:39:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-10 11:39:23 +0100 |
| commit | d1b080290f86d134b97bfe63e499ab9ed3935a02 (patch) | |
| tree | 876c01fc58578c00968edbe057b1db2edb8c80ad /include/linux | |
| parent | d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff) | |
| parent | e874e6c7edc43436f73cf84157d9221f8b807c36 (diff) | |
Merge tag 'regmap-force' into asoc-rcar
regmap: Force write support
This allows users to use _update_bits() without the write suppression,
useful for some hardware.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regmap.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 59c55ea0f0b5..519c96231a91 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -424,6 +424,8 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, size_t val_count); int regmap_update_bits(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val); +int regmap_write_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val); int regmap_update_bits_async(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val); int regmap_update_bits_check(struct regmap *map, unsigned int reg, @@ -503,6 +505,8 @@ int regmap_field_update_bits(struct regmap_field *field, int regmap_fields_write(struct regmap_field *field, unsigned int id, unsigned int val); +int regmap_fields_force_write(struct regmap_field *field, unsigned int id, + unsigned int val); int regmap_fields_read(struct regmap_field *field, unsigned int id, unsigned int *val); int regmap_fields_update_bits(struct regmap_field *field, unsigned int id, @@ -645,6 +649,13 @@ static inline int regmap_update_bits(struct regmap *map, unsigned int reg, return -EINVAL; } +static inline int regmap_write_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val) +{ + WARN_ONCE(1, "regmap API is disabled"); + return -EINVAL; +} + static inline int regmap_update_bits_async(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val) |