diff mbox

ASoC: soc-core: care Codec <-> Codec case by non_legacy_dai_naming

Message ID 87y3m4d1p7.wl%kuninori.morimoto.gx@renesas.com (mailing list archive)
State Accepted
Commit cb2cf0de1174701b7c8c0285a0f398b9f2d30d8e
Headers show

Commit Message

Kuninori Morimoto Dec. 15, 2017, 5:10 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

CPU/Codec categorize will be removed soon.
Then, it need to know DAI is Codec somehow. This patch uses component
driver's "non_legacy_dai_naming" which is used by Codec for it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---

> Hi Mark

I noticed my prepare patch for CPU/Codec conversion
missed about Codec <-> Codec case.
I think this patch can solve this issue.
But, I can't test Codec <-> Codec, unfortunately...

 sound/soc/soc-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 89dfdd0..411a304 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1726,7 +1726,9 @@  int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 	}
 
 	/* Flip the polarity for the "CPU" end of a CODEC<->CODEC link */
-	if (cpu_dai->codec) {
+	/* the component which has non_legacy_dai_naming is Codec */
+	if (cpu_dai->codec ||
+	    cpu_dai->component->driver->non_legacy_dai_naming) {
 		unsigned int inv_dai_fmt;
 
 		inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;