summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorDimitris Papastamos <dp@opensource.wolfsonmicro.com>2011-03-22 10:36:57 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-26 17:44:24 +0000
commit67850a892bf627e1c627bc8d0bcd84b90ecc9d7f (patch)
tree26508a11f86f3ee3981d18c8f7119f58100c9235 /include/sound/soc.h
parent5fb609d435f0679ed322ddeb1fdafe6142463fdf (diff)
downloadop-kernel-dev-67850a892bf627e1c627bc8d0bcd84b90ecc9d7f.zip
op-kernel-dev-67850a892bf627e1c627bc8d0bcd84b90ecc9d7f.tar.gz
ASoC: Add control_type in snd_soc_codec
This is mainly used by the soc-cache code to easily determine the currently used underlying serial bus. Set SND_SOC_CUSTOM to 1 so we can distinguish it if it is not initialized or set. Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 2f2a51f..4a11795 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -248,7 +248,7 @@ typedef int (*hw_write_t)(void *,const char* ,int);
extern struct snd_ac97_bus_ops soc_ac97_ops;
enum snd_soc_control_type {
- SND_SOC_CUSTOM,
+ SND_SOC_CUSTOM = 1,
SND_SOC_I2C,
SND_SOC_SPI,
};
@@ -539,6 +539,7 @@ struct snd_soc_codec {
/* codec IO */
void *control_data; /* codec control (i2c/3wire) data */
+ enum snd_soc_control_type control_type;
hw_write_t hw_write;
unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
unsigned int (*read)(struct snd_soc_codec *, unsigned int);
OpenPOWER on IntegriCloud