diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 10:47:02 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-28 15:10:31 +0100 |
| commit | 0efd1d7cbcc5f5be4025fc6cd2809e50c3030f09 (patch) | |
| tree | 4eb630a669ce1a59bb99feed404cc95a8013cc81 /sound/soc | |
| parent | 716407ea57fa38fc1b04c699f1b83847cf669872 (diff) | |
| download | linux-0efd1d7cbcc5f5be4025fc6cd2809e50c3030f09.tar.bz2 | |
ASoC: atmel: sam9g20_wm8731: consider CPU-Platform possibility
commit bfc7938e58142a5 ("ASoC: atmel: sam9g20_wm8731: 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 bfc7938e58142a5 ("ASoC: atmel: sam9g20_wm8731: 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')
| -rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index df098d3cf844..b1bef2bf142d 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -118,7 +118,8 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) SND_SOC_DAILINK_DEFS(pcm, DAILINK_COMP_ARRAY(COMP_CPU("at91rm9200_ssc.0")), - DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi"))); + DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("at91rm9200_ssc.0"))); static struct snd_soc_dai_link at91sam9g20ek_dai = { .name = "WM8731", @@ -209,12 +210,14 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) /* Parse dai and platform info */ at91sam9g20ek_dai.cpus->dai_name = NULL; + at91sam9g20ek_dai.platforms->name = NULL; cpu_np = of_parse_phandle(np, "atmel,ssc-controller", 0); if (!cpu_np) { dev_err(&pdev->dev, "dai and pcm info missing\n"); return -EINVAL; } at91sam9g20ek_dai.cpus->of_node = cpu_np; + at91sam9g20ek_dai.platforms->of_node = cpu_np; of_node_put(codec_np); of_node_put(cpu_np); |