diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-02-04 19:02:53 +0100 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-02-04 19:14:13 +0100 |
commit | 84d555aa74434392b682fd9eb0fa701c89a046d6 (patch) | |
tree | bcc0a9bf058757da14054bce61a8cb8b8c9cd873 /target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch | |
parent | 953973c2991e8640549a55df7a0574a1abac8644 (diff) | |
download | upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.tar.gz upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.tar.bz2 upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch b/target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch deleted file mode 100644 index dcfbb9dd1a..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch +++ /dev/null @@ -1,34 +0,0 @@ -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); |