From: Kuninori Morimoto <[email protected]>
snd_soc_find_dai() will check dai_name after of_node matching
if dai_link has it. but, it will never match if name was
created by fmt_single_name(). Thus, we need to remove cpu_dai_name
if cpu was single.
Before, simple-card assumed that CPU was single if Card has single
link. It is no problem in below case
/* Card uses 1 link */
card {
compatible = "audio-graph-card";
...
dais = <&cpu_port0>;
};
/* CPU has single endpoints */
cpu {
...
cpu_port0: port@0 {
endpoint { ... };
};
};
But it can't handle correctly below case.
This patch uses new asoc_simple_card_of_canonicalize_cpu() and
confirm it was single or not by counting endpoint.
/* Card uses only 1 link */
card {
compatible = "audio-graph-card";
...
dais = <&cpu_port0>;
};
/* CPU has many endpoints */
cpu {
...
ports {
cpu_port0: port@0 {
endpoint { ... };
};
cpu_port1: port@1 {
endpoint { ... };
};
...
};
};
Signed-off-by: Kuninori Morimoto <[email protected]>
---
sound/soc/generic/audio-graph-card.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sound/soc/generic/audio-graph-card.c
b/sound/soc/generic/audio-graph-card.c
index 885b405..5e5b8bb 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -100,7 +100,6 @@ static int asoc_graph_card_dai_link_of(struct device_node
*cpu_port,
struct graph_dai_props *dai_props = graph_priv_to_props(priv, idx);
struct asoc_simple_dai *cpu_dai = &dai_props->cpu_dai;
struct asoc_simple_dai *codec_dai = &dai_props->codec_dai;
- struct snd_soc_card *card = graph_priv_to_card(priv);
struct device_node *cpu_ep = of_get_next_child(cpu_port, NULL);
struct device_node *codec_ep = of_graph_get_remote_endpoint(cpu_ep);
struct device_node *rcpu_ep = of_graph_get_remote_endpoint(codec_ep);
@@ -161,8 +160,7 @@ static int asoc_graph_card_dai_link_of(struct device_node
*cpu_port,
dai_link->ops = &asoc_graph_card_ops;
dai_link->init = asoc_graph_card_dai_init;
- asoc_simple_card_canonicalize_cpu(dai_link,
- card->num_links == 1);
+ asoc_simple_card_of_canonicalize_cpu(dai_link);
dai_link_of_err:
of_node_put(cpu_ep);
--
1.9.1
