Merge remote-tracking branch 'asoc/topic/component' into asoc-core

Conflicts:
	include/sound/soc.h

1 files changed, 27 insertions, 14 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a72af6327987..b13eecbaea78 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -13,6 +13,7 @@
 #ifndef __LINUX_SND_SOC_H
 #define __LINUX_SND_SOC_H
 
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
 #include <linux/notifier.h>
@@ -630,6 +631,26 @@ struct snd_soc_compr_ops {
         int (*trigger)(struct snd_compr_stream *);
 };
 
+/* component interface */
+struct snd_soc_component_driver {
+        const char *name;
+
+        /* DT */
+        int (*of_xlate_dai_name)(struct snd_soc_component *component,
+                                 struct of_phandle_args *args,
+                                 const char **dai_name);
+};
+
+struct snd_soc_component {
+        const char *name;
+        int id;
+        int num_dai;
+        struct device *dev;
+        struct list_head list;
+
+        const struct snd_soc_component_driver *driver;
+};
+
 /* SoC Audio Codec device */
 struct snd_soc_codec {
         const char *name;
@@ -670,6 +691,9 @@ struct snd_soc_codec {
         struct mutex cache_rw_mutex;
         int val_bytes;
 
+        /* component */
+        struct snd_soc_component component;
+
         /* dapm */
         struct snd_soc_dapm_context dapm;
         unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
@@ -688,6 +712,7 @@ struct snd_soc_codec_driver {
         int (*remove)(struct snd_soc_codec *);
         int (*suspend)(struct snd_soc_codec *);
         int (*resume)(struct snd_soc_codec *);
+        struct snd_soc_component_driver component_driver;
 
         /* Default control and setup, added after probe() is run */
         const struct snd_kcontrol_new *controls;
@@ -801,20 +826,6 @@ struct snd_soc_platform {
 #endif
 };
 
-struct snd_soc_component_driver {
-        const char *name;
-};
-
-struct snd_soc_component {
-        const char *name;
-        int id;
-        int num_dai;
-        struct device *dev;
-        struct list_head list;
-
-        const struct snd_soc_component_driver *driver;
-};
-
 struct snd_soc_dai_link {
         /* config - must be set by machine driver */
         const char *name;                       /* Codec name */
@@ -1145,6 +1156,8 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                                    const char *propname);
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                      const char *prefix);
+int snd_soc_of_get_dai_name(struct device_node *of_node,
+                            const char **dai_name);
 
 #include <sound/soc-dai.h>