diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 09:14:24 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 09:14:24 -0400 |
| commit | 4a6be7bb7474500a69f6d8f25899b8038491bdbb (patch) | |
| tree | a2645b0f707fcf1ea94a9e7ef7a59b298fb5ecac /include/linux/regmap.h | |
| parent | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (diff) | |
| parent | f9353e70bcebd00cd182d946083afd7d8eddd259 (diff) | |
Merge remote-tracking branches 'regmap/topic/patch' and 'regmap/topic/sync' 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 56ca477d5098..bb13efc4b906 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
| @@ -158,6 +158,8 @@ int regmap_update_bits_check(struct regmap *map, unsigned int reg, | |||
| 158 | bool *change); | 158 | bool *change); |
| 159 | 159 | ||
| 160 | int regcache_sync(struct regmap *map); | 160 | int regcache_sync(struct regmap *map); |
| 161 | int regcache_sync_region(struct regmap *map, unsigned int min, | ||
| 162 | unsigned int max); | ||
| 161 | void regcache_cache_only(struct regmap *map, bool enable); | 163 | void regcache_cache_only(struct regmap *map, bool enable); |
| 162 | void regcache_cache_bypass(struct regmap *map, bool enable); | 164 | void regcache_cache_bypass(struct regmap *map, bool enable); |
| 163 | void regcache_mark_dirty(struct regmap *map); | 165 | void regcache_mark_dirty(struct regmap *map); |