diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 04:47:10 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-28 17:10:51 +0300 |
| commit | 6910bb935a448f3af64bf4ab7754cc0870590146 (patch) | |
| tree | 57925b37f55718d7a7b8388f4bdf538cdaa59ba2 /sound/soc/atmel | |
| parent | e1be6aa0984e8b3d1aeccda527360f9c7c9ff54f (diff) | |
| download | linux-6910bb935a448f3af64bf4ab7754cc0870590146.tar.xz | |
ASoC: atmel: tse850-pcm5142: consider CPU-Platform possibility
commit 655368dfc75e8 ("ASoC: atmel: tse850-pcm5142: don't select
unnecessary Platform")
Current ALSA SoC avoid to add duplicate component to rtd,
and this driver was selecting CPU component as Platform component.
Thus, above patch removed Platform settings from this driver,
because it assumed these are same component.
But, some CPU driver is using generic DMAEngine, in such case, both
CPU component and Platform component will have same of_node/name.
In other words, there are some components which are different but
have same of_node/name.
In such case, Card driver definitely need to select Platform even
though it is same as CPU.
It is depends on CPU driver, but is difficult to know it from Card driver.
This patch reverts above patch.
Fixes: commit 655368dfc75e8 ("ASoC: atmel: tse850-pcm5142: don't select unnecessary Platform")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/tse850-pcm5142.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c index 319acb1676c7..59e2edb22b3a 100644 --- a/sound/soc/atmel/tse850-pcm5142.c +++ b/sound/soc/atmel/tse850-pcm5142.c @@ -296,7 +296,8 @@ static const struct snd_soc_dapm_route tse850_intercon[] = { SND_SOC_DAILINK_DEFS(pcm, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "pcm512x-hifi"))); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "pcm512x-hifi")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); static struct snd_soc_dai_link tse850_dailink = { .name = "TSE-850", @@ -336,6 +337,7 @@ static int tse850_dt_init(struct platform_device *pdev) return -EINVAL; } dailink->cpus->of_node = cpu_np; + dailink->platforms->of_node = cpu_np; of_node_put(cpu_np); codec_np = of_parse_phandle(np, "axentia,audio-codec", 0); |