]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() ID method
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 14 Dec 2018 02:29:42 +0000 (11:29 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 14 Dec 2018 11:44:34 +0000 (11:44 +0000)
commit9748b68fecc7a609e34d78e7cd0cd221e86d37b8
tree7c083695ffc902919668d767309bd3b8c317b333
parent89eefb11cf747c8785ab078aab87b71889cc9bd0
ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() ID method

commit 867ca4c6d6572 ("ASoC: simple-card-utils: fixup
asoc_simple_card_get_dai_id() counting") fixuped getting DAI ID method.
It will get DAI ID from OF graph "port", but, we want to consider about
"endpoint", too.
And, we also want to keep compatibility.

This patch fixup it as

if (driver has specified DAI ID)
use it as DAI ID
else if (OF graph endpoint has reg)
use it as DAI ID
else if (OF graph port has reg)
use it as DAI ID
else
use endpoint count as DAI ID

Fixes: commit 867ca4c6d6572 ("ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() counting")
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card-utils.c