Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic...

[sfrench/cifs-2.6.git] / sound / soc / generic / simple-card-utils.c

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 7d7ab4aee42e3ab133926f2dc5b11489b93a28ae..3751a07de6aac1c6bab6e670abd9c91832fd7f51 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -132,7 +132,7 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
 
        /* Parse the card name from DT */
        ret = snd_soc_of_parse_card_name(card, "label");
-       if (ret < 0) {
+       if (ret < 0 || !card->name) {
                char prop[128];
 
                snprintf(prop, sizeof(prop), "%sname", prefix);
@@ -196,7 +196,11 @@ int asoc_simple_card_parse_clk(struct device *dev,
                        simple_dai->sysclk = clk_get_rate(clk);
        }
 
-       dev_dbg(dev, "%s : sysclk = %d\n", name, simple_dai->sysclk);
+       if (of_property_read_bool(node, "system-clock-direction-out"))
+               simple_dai->clk_direction = SND_SOC_CLOCK_OUT;
+
+       dev_dbg(dev, "%s : sysclk = %d, direction %d\n", name,
+               simple_dai->sysclk, simple_dai->clk_direction);
 
        return 0;
 }
@@ -308,7 +312,8 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
        int ret;
 
        if (simple_dai->sysclk) {
-               ret = snd_soc_dai_set_sysclk(dai, 0, simple_dai->sysclk, 0);
+               ret = snd_soc_dai_set_sysclk(dai, 0, simple_dai->sysclk,
+                                            simple_dai->clk_direction);
                if (ret && ret != -ENOTSUPP) {
                        dev_err(dai->dev, "simple-card: set_sysclk error\n");
                        return ret;