aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitris Papastamos <dp@opensource.wolfsonmicro.com>2011-03-22 06:36:57 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-26 13:44:24 -0400
commit67850a892bf627e1c627bc8d0bcd84b90ecc9d7f (patch)
tree26508a11f86f3ee3981d18c8f7119f58100c9235
parent5fb609d435f0679ed322ddeb1fdafe6142463fdf (diff)
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>
-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 2f2a51fe78e9..4a11795aaee3 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -248,7 +248,7 @@ typedef int (*hw_write_t)(void *,const char* ,int);
248extern struct snd_ac97_bus_ops soc_ac97_ops; 248extern struct snd_ac97_bus_ops soc_ac97_ops;
249 249
250enum snd_soc_control_type { 250enum snd_soc_control_type {
251 SND_SOC_CUSTOM, 251 SND_SOC_CUSTOM = 1,
252 SND_SOC_I2C, 252 SND_SOC_I2C,
253 SND_SOC_SPI, 253 SND_SOC_SPI,
254}; 254};
@@ -539,6 +539,7 @@ struct snd_soc_codec {
539 539
540 /* codec IO */ 540 /* codec IO */
541 void *control_data; /* codec control (i2c/3wire) data */ 541 void *control_data; /* codec control (i2c/3wire) data */
542 enum snd_soc_control_type control_type;
542 hw_write_t hw_write; 543 hw_write_t hw_write;
543 unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int); 544 unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
544 unsigned int (*read)(struct snd_soc_codec *, unsigned int); 545 unsigned int (*read)(struct snd_soc_codec *, unsigned int);