Merge remote-tracking branch 'asoc/topic/kconfig' into asoc-next

[deliverable/linux.git] / include / sound / soc-topology.h

diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h
index 5b68e3f5aa85b301eaab5ff6975b76e257a00c52..b897b9d6316119bae25dcf81aac8c21bee1970ab 100644 (file)
--- a/include/sound/soc-topology.h
+++ b/include/sound/soc-topology.h
@@ -56,12 +56,6 @@ struct snd_soc_dobj_widget {
        unsigned int kcontrol_enum:1;   /* this widget is an enum kcontrol */
 };
 
-/* dynamic PCM DAI object */
-struct snd_soc_dobj_pcm_dai {
-       struct snd_soc_tplg_pcm_dai *pd;
-       unsigned int count;
-};
-
 /* generic dynamic object - all dynamic objects belong to this struct */
 struct snd_soc_dobj {
        enum snd_soc_dobj_type type;
@@ -71,7 +65,6 @@ struct snd_soc_dobj {
        union {
                struct snd_soc_dobj_control control;
                struct snd_soc_dobj_widget widget;
-               struct snd_soc_dobj_pcm_dai pcm_dai;
        };
        void *private; /* core does not touch this */
 };
@@ -126,10 +119,16 @@ struct snd_soc_tplg_ops {
        int (*widget_unload)(struct snd_soc_component *,
                struct snd_soc_dobj *);
 
-       /* FE - used for any driver specific init */
-       int (*pcm_dai_load)(struct snd_soc_component *,
-               struct snd_soc_tplg_pcm_dai *pcm_dai, int num_fe);
-       int (*pcm_dai_unload)(struct snd_soc_component *,
+       /* FE DAI - used for any driver specific init */
+       int (*dai_load)(struct snd_soc_component *,
+               struct snd_soc_dai_driver *dai_drv);
+       int (*dai_unload)(struct snd_soc_component *,
+               struct snd_soc_dobj *);
+
+       /* DAI link - used for any driver specific init */
+       int (*link_load)(struct snd_soc_component *,
+               struct snd_soc_dai_link *link);
+       int (*link_unload)(struct snd_soc_component *,
                struct snd_soc_dobj *);
 
        /* callback to handle vendor bespoke data */