diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-23 12:10:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 15:13:50 +0100 |
| commit | bd132ec585c498ee27d7eedf8569703606743928 (patch) | |
| tree | 6cc18bbb9efa29ac4676dfcbe74a435a670dce27 /sound/soc/codecs/wm5100.h | |
| parent | ASoC: Convert WM8962 to direct regmap usage (diff) | |
| download | linux-bd132ec585c498ee27d7eedf8569703606743928.tar.xz linux-bd132ec585c498ee27d7eedf8569703606743928.zip | |
ASoC: Convert wm5100 to direct regmap API usage
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm5100.h')
| -rw-r--r-- | sound/soc/codecs/wm5100.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm5100.h b/sound/soc/codecs/wm5100.h index 970759636bdc..25cb6016f9d7 100644 --- a/sound/soc/codecs/wm5100.h +++ b/sound/soc/codecs/wm5100.h @@ -15,6 +15,7 @@ #define WM5100_ASOC_H #include <sound/soc.h> +#include <linux/regmap.h> int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack); @@ -5147,9 +5148,9 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack); #define WM5100_DSP3_ZM_END_SHIFT 0 /* DSP3_ZM_END - [15:0] */ #define WM5100_DSP3_ZM_END_WIDTH 16 /* DSP3_ZM_END - [15:0] */ -int wm5100_readable_register(struct snd_soc_codec *codec, unsigned int reg); -int wm5100_volatile_register(struct snd_soc_codec *codec, unsigned int reg); +bool wm5100_readable_register(struct device *dev, unsigned int reg); +bool wm5100_volatile_register(struct device *dev, unsigned int reg); -extern u16 wm5100_reg_defaults[WM5100_MAX_REGISTER + 1]; +extern struct reg_default wm5100_reg_defaults[WM5100_REGISTER_COUNT]; #endif |