Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
[sfrench/cifs-2.6.git] / sound / soc / soc-core.c
index 180bfbfe833da3c53a32a1845392d2af554e3929..921622a019448394687655034f52befb4abfd6ec 100644 (file)
@@ -34,6 +34,7 @@
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/of_graph.h>
 #include <linux/dmi.h>
 #include <sound/core.h>
 #include <sound/jack.h>
@@ -3992,11 +3993,15 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                prefix = "";
 
        /*
-        * check "[prefix]format = xxx"
+        * check "dai-format = xxx"
+        * or    "[prefix]format = xxx"
         * SND_SOC_DAIFMT_FORMAT_MASK area
         */
-       snprintf(prop, sizeof(prop), "%sformat", prefix);
-       ret = of_property_read_string(np, prop, &str);
+       ret = of_property_read_string(np, "dai-format", &str);
+       if (ret < 0) {
+               snprintf(prop, sizeof(prop), "%sformat", prefix);
+               ret = of_property_read_string(np, prop, &str);
+       }
        if (ret == 0) {
                for (i = 0; i < ARRAY_SIZE(of_fmt_table); i++) {
                        if (strcmp(str, of_fmt_table[i].name) == 0) {
@@ -4076,6 +4081,42 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
 
+int snd_soc_get_dai_id(struct device_node *ep)
+{
+       struct snd_soc_component *pos;
+       struct device_node *node;
+       int ret;
+
+       node = of_graph_get_port_parent(ep);
+
+       /*
+        * For example HDMI case, HDMI has video/sound port,
+        * but ALSA SoC needs sound port number only.
+        * Thus counting HDMI DT port/endpoint doesn't work.
+        * Then, it should have .of_xlate_dai_id
+        */
+       ret = -ENOTSUPP;
+       mutex_lock(&client_mutex);
+       list_for_each_entry(pos, &component_list, list) {
+               struct device_node *component_of_node = pos->dev->of_node;
+
+               if (!component_of_node && pos->dev->parent)
+                       component_of_node = pos->dev->parent->of_node;
+
+               if (component_of_node != node)
+                       continue;
+
+               if (pos->driver->of_xlate_dai_id)
+                       ret = pos->driver->of_xlate_dai_id(pos, ep);
+
+               break;
+       }
+       mutex_unlock(&client_mutex);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_get_dai_id);
+
 int snd_soc_get_dai_name(struct of_phandle_args *args,
                                const char **dai_name)
 {