mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From 4ca89eb8570cb86314a5a7b55a15d15f53ce5757 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Johannes Krude <johannes@krude.de>
|
||
|
|
Date: Sat, 16 Nov 2019 12:41:06 +0100
|
||
|
|
Subject: [PATCH] sound/soc: only first codec is master in multicodec
|
||
|
|
setup
|
||
|
|
|
||
|
|
When using multiple codecs, at most one codec should generate the master
|
||
|
|
clock. All codecs except the first are therefore configured for slave
|
||
|
|
mode.
|
||
|
|
|
||
|
|
Signed-off-by: Johannes Krude <johannes@krude.de>
|
||
|
|
---
|
||
|
|
sound/soc/soc-core.c | 9 ++++++++-
|
||
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/sound/soc/soc-core.c
|
||
|
|
+++ b/sound/soc/soc-core.c
|
||
|
|
@@ -1688,8 +1688,15 @@ int snd_soc_runtime_set_dai_fmt(struct s
|
||
|
|
|
||
|
|
for (i = 0; i < rtd->num_codecs; i++) {
|
||
|
|
struct snd_soc_dai *codec_dai = codec_dais[i];
|
||
|
|
+ unsigned int codec_dai_fmt = dai_fmt;
|
||
|
|
|
||
|
|
- ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
|
||
|
|
+ // there can only be one master when using multiple codecs
|
||
|
|
+ if (i && (codec_dai_fmt & SND_SOC_DAIFMT_MASTER_MASK)) {
|
||
|
|
+ codec_dai_fmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
|
||
|
|
+ codec_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ ret = snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt);
|
||
|
|
if (ret != 0 && ret != -ENOTSUPP) {
|
||
|
|
dev_warn(codec_dai->dev,
|
||
|
|
"ASoC: Failed to set DAI format: %d\n", ret);
|