diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-20 12:10:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-20 12:10:09 +0100 |
| commit | eefad7fd53eae2eb8d1e205b1d3a18f67e4e6b46 (patch) | |
| tree | 497ef1a21d90c63ac2e4ca6389c0844d0d72b0a8 /include/linux/regmap.h | |
| parent | b9ecc4ee28a5ff5b3997da247cd9df1320c602a9 (diff) | |
| parent | ac9ef6cf9196107115930e9fc66207199ef395b3 (diff) | |
Merge branch 'topic/convert-bint' into topic/hda
Merge the conversions to bint module option type.
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 946868c67cd6..eb93921cdd30 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -23,7 +23,6 @@ struct spi_device; /* An enum of all the supported cache types */ enum regcache_type { REGCACHE_NONE, - REGCACHE_INDEXED, REGCACHE_RBTREE, REGCACHE_COMPRESSED }; @@ -83,7 +82,7 @@ struct regmap_config { bool (*precious_reg)(struct device *dev, unsigned int reg); unsigned int max_register; - struct reg_default *reg_defaults; + const struct reg_default *reg_defaults; unsigned int num_reg_defaults; enum regcache_type cache_type; const void *reg_defaults_raw; @@ -141,6 +140,9 @@ 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_update_bits_check(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val, + bool *change); int regcache_sync(struct regmap *map); void regcache_cache_only(struct regmap *map, bool enable); |