From: Dimitris Papastamos Date: Tue, 22 Mar 2011 10:36:57 +0000 (+0000) Subject: ASoC: Add control_type in snd_soc_codec X-Git-Tag: MMI-PSA29.97-13-9~16612^2~1224^2~44 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=67850a892bf627e1c627bc8d0bcd84b90ecc9d7f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- 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); 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);