aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regmap.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-28 16:01:34 -0400
committerMark Brown <broonie@linaro.org>2013-10-28 16:01:34 -0400
commit18f513db93408fdeeba68d5b0931bc26315d28b4 (patch)
tree111d33e40ac84adea0c625a393d5724a69d0da4b /include/linux/regmap.h
parent6cf3d823230794a6e6b3f99541cdb91176614036 (diff)
parente33fabd365596178e72f62bb4b89f0aaad0509ad (diff)
Merge remote-tracking branch 'regmap/topic/multi' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r--include/linux/regmap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index dc90b8c134a1..336718382ebb 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -379,6 +379,8 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,
379 const void *val, size_t val_len); 379 const void *val, size_t val_len);
380int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 380int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
381 size_t val_count); 381 size_t val_count);
382int regmap_multi_reg_write(struct regmap *map, struct reg_default *regs,
383 int num_regs);
382int regmap_raw_write_async(struct regmap *map, unsigned int reg, 384int regmap_raw_write_async(struct regmap *map, unsigned int reg,
383 const void *val, size_t val_len); 385 const void *val, size_t val_len);
384int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val); 386int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val);