Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/topic...

[karo-tx-linux.git] / include / sound / soc-dai.h

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e8b3080d196a7d6a336caa7b56ede832f4e44607..2df96b1384c718fdecc2a26d423a484dc5a9d727 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -206,7 +206,6 @@ struct snd_soc_dai_driver {
        /* DAI description */
        const char *name;
        unsigned int id;
-       int ac97_control;
        unsigned int base;
 
        /* DAI driver callbacks */
@@ -216,6 +215,8 @@ struct snd_soc_dai_driver {
        int (*resume)(struct snd_soc_dai *dai);
        /* compress dai */
        bool compress_dai;
+       /* DAI is also used for the control bus */
+       bool bus_control;
 
        /* ops */
        const struct snd_soc_dai_ops *ops;
@@ -241,7 +242,6 @@ struct snd_soc_dai {
        const char *name;
        int id;
        struct device *dev;
-       void *ac97_pdata;       /* platform_data for the ac97 codec */
 
        /* driver ops */
        struct snd_soc_dai_driver *driver;
@@ -268,7 +268,6 @@ struct snd_soc_dai {
        unsigned int sample_bits;
 
        /* parent platform/codec */
-       struct snd_soc_platform *platform;
        struct snd_soc_codec *codec;
        struct snd_soc_component *component;
 
@@ -276,8 +275,6 @@ struct snd_soc_dai {
        unsigned int tx_mask;
        unsigned int rx_mask;
 
-       struct snd_soc_card *card;
-
        struct list_head list;
 };