diff options
author | Mark Brown <broonie@kernel.org> | 2020-04-20 14:35:07 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-04-20 14:35:07 +0100 |
commit | 036889b21cbac51b9743ae31b755e925c8de26c4 (patch) | |
tree | 9ea200dd2d66e55cb558e7e365a3030f043a063e /sound/soc/meson/gx-card.c | |
parent | ASoC: dapm: fixup dapm kcontrol widget (diff) | |
parent | ASoC: meson: gx-card: fix codec-to-codec link setup (diff) | |
download | wireguard-linux-036889b21cbac51b9743ae31b755e925c8de26c4.tar.xz wireguard-linux-036889b21cbac51b9743ae31b755e925c8de26c4.zip |
Merge series "ASoC: meson: fix codec-to-codec link setup" from Jerome Brunet <jbrunet@baylibre.com>:
This patchset fixes the problem reported by Marc in this thread [0]
The problem was due to an error in the meson card drivers which had
the "no_pcm" dai_link property set on codec-to-codec links
[0]: https://lore.kernel.org/r/20200417122732.GC5315@sirena.org.uk
Jerome Brunet (2):
ASoC: meson: axg-card: fix codec-to-codec link setup
ASoC: meson: gx-card: fix codec-to-codec link setup
sound/soc/meson/axg-card.c | 4 +++-
sound/soc/meson/gx-card.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
--
2.25.2
Diffstat (limited to 'sound/soc/meson/gx-card.c')
-rw-r--r-- | sound/soc/meson/gx-card.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c index 7b01dcb73e5e..4abf7efb7eac 100644 --- a/sound/soc/meson/gx-card.c +++ b/sound/soc/meson/gx-card.c @@ -108,8 +108,10 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, ret = gx_card_parse_i2s(card, np, index); /* Or apply codec to codec params if necessary */ - else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) + else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) { dai_link->params = &codec_params; + dai_link->no_pcm = 0; /* link is not a DPCM BE */ + } return ret; } |