diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-02 17:07:42 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:07:42 +0100 |
commit | ef98ae45e6b3ea17d3ed27cec9afdd7e46f916ae (patch) | |
tree | 2e6073737a0b056842d9137314c2ab43db75d862 /include | |
parent | 522168d178208ff821b9bc37ffcd2442b80f6e6d (diff) | |
parent | b42261078a91db8a8307db42cad41a619077d1df (diff) |
Merge remote-tracking branch 'regmap/topic/smbus' into regmap-next
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/regmap.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 85691b9b4fa7..7b0e4b425cdf 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -276,6 +276,10 @@ typedef int (*regmap_hw_async_write)(void *context, typedef int (*regmap_hw_read)(void *context, const void *reg_buf, size_t reg_size, void *val_buf, size_t val_size); +typedef int (*regmap_hw_reg_read)(void *context, unsigned int reg, + unsigned int *val); +typedef int (*regmap_hw_reg_write)(void *context, unsigned int reg, + unsigned int val); typedef struct regmap_async *(*regmap_hw_async_alloc)(void); typedef void (*regmap_hw_free_context)(void *context); @@ -309,7 +313,9 @@ struct regmap_bus { regmap_hw_write write; regmap_hw_gather_write gather_write; regmap_hw_async_write async_write; + regmap_hw_reg_write reg_write; regmap_hw_read read; + regmap_hw_reg_read reg_read; regmap_hw_free_context free_context; regmap_hw_async_alloc async_alloc; u8 read_flag_mask; |