ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() counting
asoc_simple_card_get_dai_id() returns DAI ID, but it is based on DT node's "endpoint" position. Almost all cases 1 port has 1 endpoint, thus, it was no problem. But in reality, port : endpoint = 1 : N, thus, counting endpoint is BUG, it should based on "port" ID. This patch fixup it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
538a4ffea3
Коммит
b6f3fc005a
|
@ -269,35 +269,19 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_parse_dai);
|
|||
|
||||
static int asoc_simple_card_get_dai_id(struct device_node *ep)
|
||||
{
|
||||
struct device_node *node;
|
||||
struct device_node *endpoint;
|
||||
int i, id;
|
||||
struct of_endpoint info;
|
||||
int ret;
|
||||
|
||||
ret = snd_soc_get_dai_id(ep);
|
||||
if (ret != -ENOTSUPP)
|
||||
return ret;
|
||||
|
||||
node = of_graph_get_port_parent(ep);
|
||||
|
||||
/*
|
||||
* Non HDMI sound case, counting port/endpoint on its DT
|
||||
* is enough. Let's count it.
|
||||
*/
|
||||
i = 0;
|
||||
id = -1;
|
||||
for_each_endpoint_of_node(node, endpoint) {
|
||||
if (endpoint == ep)
|
||||
id = i;
|
||||
i++;
|
||||
}
|
||||
|
||||
of_node_put(node);
|
||||
|
||||
if (id < 0)
|
||||
return -ENODEV;
|
||||
|
||||
return id;
|
||||
of_graph_parse_endpoint(ep, &info);
|
||||
return info.port;
|
||||
}
|
||||
|
||||
int asoc_simple_card_parse_graph_dai(struct device_node *ep,
|
||||
|
|
Загрузка…
Ссылка в новой задаче