diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 09:15:48 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 09:15:48 -0400 |
commit | addfd8a09e1f434a73b3d87d36ef050c73511d2b (patch) | |
tree | 22dd5a1f108dcd123797dbe9f5aa45e8d3faa492 /include/linux/regmap.h | |
parent | eae4b51b21f7452b0b53a9848f48c02cb0fac336 (diff) | |
parent | df00c79f78d8b0ad788daf689ea461ace9d0811f (diff) |
Merge remote-tracking branch 'regmap/topic/bulk' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r-- | include/linux/regmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 398377d89332..5d7e6add0084 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -146,6 +146,8 @@ int regmap_reinit_cache(struct regmap *map, | |||
146 | int regmap_write(struct regmap *map, unsigned int reg, unsigned int val); | 146 | int regmap_write(struct regmap *map, unsigned int reg, unsigned int val); |
147 | int regmap_raw_write(struct regmap *map, unsigned int reg, | 147 | int regmap_raw_write(struct regmap *map, unsigned int reg, |
148 | const void *val, size_t val_len); | 148 | const void *val, size_t val_len); |
149 | int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, | ||
150 | size_t val_count); | ||
149 | int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val); | 151 | int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val); |
150 | int regmap_raw_read(struct regmap *map, unsigned int reg, | 152 | int regmap_raw_read(struct regmap *map, unsigned int reg, |
151 | void *val, size_t val_len); | 153 | void *val, size_t val_len); |