diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-08 20:35:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-08 20:35:33 -0800 |
| commit | de740386447f768d3ea03137761364dd13f499b3 (patch) | |
| tree | dffb8788fc22a89bde9c13241bdf83008cd2d73e /include | |
| parent | Merge tag 'hwmon-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff) | |
| parent | Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into regmap-next (diff) | |
| download | wireguard-linux-de740386447f768d3ea03137761364dd13f499b3.tar.xz wireguard-linux-de740386447f768d3ea03137761364dd13f499b3.zip | |
Merge tag 'regmap-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown:
"A couple of new features this time around, nothing that should have
any impact on most users:
- Cleanups and optimization of the path for reading back the register
defaults from the hardware at startup, reducing boot times for
devices that use this (most don't, either populating on demand or
providing defaults).
- A bus implementation for AC'97 devices"
* tag 'regmap-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: ac97: Add generic AC'97 callbacks
regmap: cache: Sort include headers alphabetically
regmap: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
regmap: cache: use kmalloc_array instead of kmalloc
regmap: cache: speed regcache_hw_init() up.
regmap: cache: fix errno in regcache_hw_init()
regmap: cache: cleanup regcache_hw_init()
regmap: cache: fix errno in regcache_hw_init()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index c5ed83f49c4e..4419b99d8d6e 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -27,6 +27,7 @@ struct spmi_device; struct regmap; struct regmap_range_cfg; struct regmap_field; +struct snd_ac97; /* An enum of all the supported cache types */ enum regcache_type { @@ -340,6 +341,8 @@ struct regmap *regmap_init_spmi_ext(struct spmi_device *dev, struct regmap *regmap_init_mmio_clk(struct device *dev, const char *clk_id, void __iomem *regs, const struct regmap_config *config); +struct regmap *regmap_init_ac97(struct snd_ac97 *ac97, + const struct regmap_config *config); struct regmap *devm_regmap_init(struct device *dev, const struct regmap_bus *bus, @@ -356,6 +359,10 @@ struct regmap *devm_regmap_init_spmi_ext(struct spmi_device *dev, struct regmap *devm_regmap_init_mmio_clk(struct device *dev, const char *clk_id, void __iomem *regs, const struct regmap_config *config); +struct regmap *devm_regmap_init_ac97(struct snd_ac97 *ac97, + const struct regmap_config *config); + +bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg); /** * regmap_init_mmio(): Initialise register map |