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 | |
| parent | ebf1474745b4373fdde0fcf32d9d1f369b50b212 (diff) | |
| parent | de911b4e683f9c28a063bb62991f2db206c38ba4 (diff) | |
| download | linux-stable-036889b21cbac51b9743ae31b755e925c8de26c4.tar.gz linux-stable-036889b21cbac51b9743ae31b755e925c8de26c4.tar.bz2 linux-stable-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')
| -rw-r--r-- | sound/soc/meson/axg-card.c | 4 | ||||
| -rw-r--r-- | sound/soc/meson/gx-card.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index af46845f4ef2..89f7f64747cd 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -338,8 +338,10 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node)) ret = axg_card_parse_tdm(card, np, index); - else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) + else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) { dai_link->params = &codec_params; + dai_link->no_pcm = 0; /* link is not a DPCM BE */ + } return ret; } 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; } |