summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 15:00:13 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 15:00:13 +0900
commitbb3784ae36e3a816696ae1f5e8490eeedef3c5cf (patch)
tree90484d199022de79cf25547ace6164435f86a28f /include/sound
parent18d4ed4342c14ebeebe60d267b171053efcdfa87 (diff)
parent0671da189c1d75eec5f6aba786d57d25209dd2bc (diff)
downloadlinux-bb3784ae36e3a816696ae1f5e8490eeedef3c5cf.tar.gz
linux-bb3784ae36e3a816696ae1f5e8490eeedef3c5cf.tar.bz2
linux-bb3784ae36e3a816696ae1f5e8490eeedef3c5cf.zip
Merge branch 'regmap-asoc' into for-3.2
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 64a9dd5a69d6..3fe658eea28b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -19,6 +19,7 @@
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
+#include <linux/regmap.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/control.h>
@@ -260,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 {
@@ -576,6 +578,7 @@ struct snd_soc_codec {
const void *reg_def_copy;
const struct snd_soc_cache_ops *cache_ops;
struct mutex cache_rw_mutex;
+ int val_bytes;
/* dapm */
struct snd_soc_dapm_context dapm;