[alsa-devel] [PATCH] ASoC: Support !CONFIG_REGMAP builds

Mark Brown broonie at opensource.wolfsonmicro.com
Sat Aug 13 04:52:42 CEST 2011


Since we changed regmap to be selected and register per bus rather than
via the core only we can't rely on it being enabled by the ASoC core.
Support compiling it out.

Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Reported-by: Axel Lin <axel.lin at gmail.com>
---
 sound/soc/soc-io.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index be5aac3..3f56d52 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -18,6 +18,7 @@
 
 #include <trace/events/asoc.h>
 
+#ifdef CONFIG_REGMAP
 static int hw_write(struct snd_soc_codec *codec, unsigned int reg,
 		    unsigned int value)
 {
@@ -150,4 +151,12 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
-
+#else
+int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
+			       int addr_bits, int data_bits,
+			       enum snd_soc_control_type control)
+{
+	return -ENOTSUPP;
+}
+EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
+#endif
-- 
1.7.5.4



More information about the Alsa-devel mailing list