diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 04:48:27 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-28 17:16:22 +0300 |
| commit | 74a25f36ba7af991c1133a5ce75d8f0a65ed3c7c (patch) | |
| tree | 702f7191341a670a3f55adf40016863b438a2f18 /sound | |
| parent | 3dfc3e9c24b742067bbcbf849caba294bdb938f6 (diff) | |
| download | linux-74a25f36ba7af991c1133a5ce75d8f0a65ed3c7c.tar.xz | |
ASoC: samsung: tm2_wm5110: consider CPU-Platform possibility
commit ae7cbcc43b8c ("ASoC: samsung: tm2_wm5110: 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 ae7cbcc43b8c ("ASoC: samsung: tm2_wm5110: 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')
| -rw-r--r-- | sound/soc/samsung/tm2_wm5110.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index a80781031f62..c091033d17ad 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -429,18 +429,22 @@ static struct snd_soc_dai_driver tm2_ext_dai[] = { SND_SOC_DAILINK_DEFS(aif1, DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif1"))); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif1")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(voice, DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif2"))); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif2")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(bt, DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif3"))); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif3")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(hdmi, DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); static struct snd_soc_dai_link tm2_dai_links[] = { @@ -572,12 +576,14 @@ static int tm2_probe(struct platform_device *pdev) unsigned int dai_index = 0; /* WM5110 */ dai_link->cpus->name = NULL; + dai_link->platforms->name = NULL; if (num_codecs > 1 && i == card->num_links - 1) dai_index = 1; /* HDMI */ dai_link->codecs->of_node = codec_dai_node[dai_index]; dai_link->cpus->of_node = cpu_dai_node[dai_index]; + dai_link->platforms->of_node = cpu_dai_node[dai_index]; } if (num_codecs > 1) { |