summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorKuninori Morimoto2017-12-15 06:10:47 +0100
committerMark Brown2017-12-15 16:03:40 +0100
commitcb2cf0de1174701b7c8c0285a0f398b9f2d30d8e (patch)
tree9717e8c2e80421b86a0b80233e3e9f8915d9f0be /sound/soc/soc-core.c
parentASoC: don't use rtd->codec on soc_dev_attr_is_visible() (diff)
downloadkernel-qcow2-linux-cb2cf0de1174701b7c8c0285a0f398b9f2d30d8e.tar.gz
kernel-qcow2-linux-cb2cf0de1174701b7c8c0285a0f398b9f2d30d8e.tar.xz
kernel-qcow2-linux-cb2cf0de1174701b7c8c0285a0f398b9f2d30d8e.zip
ASoC: soc-core: care Codec <-> Codec case by non_legacy_dai_naming
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> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 90f1122d91c4..b9ca939fd05c 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1945,7 +1945,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;