summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-24 12:23:37 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 14:59:55 +0900
commit0671da189c1d75eec5f6aba786d57d25209dd2bc (patch)
tree698ef563e3890ec8ddd8ee8bd70ad0df88c4026c
parentbe3ea3b9e8df64acb3606055c01291f0b58876a6 (diff)
downloadblackbird-op-linux-0671da189c1d75eec5f6aba786d57d25209dd2bc.tar.gz
blackbird-op-linux-0671da189c1d75eec5f6aba786d57d25209dd2bc.zip
ASoC: Add regmap as a control type
Allow drivers to set up their own regmap API structures. This is mainly useful with MFDs where the core driver will have set up regmap at the minute, though it may make sense to push the existing regmap setup out of the core into the drivers. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
-rw-r--r--include/sound/soc.h1
-rw-r--r--sound/soc/soc-io.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4d04b4b86aa1..d02269437de3 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -261,6 +261,7 @@ extern struct snd_ac97_bus_ops soc_ac97_ops;
enum snd_soc_control_type {
SND_SOC_I2C = 1,
SND_SOC_SPI,
+ SND_SOC_REGMAP,
};
enum snd_soc_compress_type {
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index b56e1c4bb9e6..e471ed667fe9 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -132,6 +132,10 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
&config);
break;
+ case SND_SOC_REGMAP:
+ /* Device has made its own regmap arrangements */
+ break;
+
default:
return -EINVAL;
}
OpenPOWER on IntegriCloud