Commit ae7cbcc4 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: samsung: tm2_wm5110: don't select unnecessary Platform

ALSA SoC is now supporting "no Platform". Sound card doesn't need to
select "CPU component" as "Platform" anymore if it doesn't need
special Platform.
This patch removes such settings.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a555b6a9
...@@ -429,21 +429,17 @@ static struct snd_soc_dai_driver tm2_ext_dai[] = { ...@@ -429,21 +429,17 @@ static struct snd_soc_dai_driver tm2_ext_dai[] = {
SND_SOC_DAILINK_DEFS(aif1, SND_SOC_DAILINK_DEFS(aif1,
DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)), 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, SND_SOC_DAILINK_DEFS(voice,
DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)), 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, SND_SOC_DAILINK_DEFS(bt,
DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)), 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, SND_SOC_DAILINK_DEFS(hdmi,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_EMPTY())); DAILINK_COMP_ARRAY(COMP_EMPTY()));
...@@ -576,14 +572,12 @@ static int tm2_probe(struct platform_device *pdev) ...@@ -576,14 +572,12 @@ static int tm2_probe(struct platform_device *pdev)
unsigned int dai_index = 0; /* WM5110 */ unsigned int dai_index = 0; /* WM5110 */
dai_link->cpus->name = NULL; dai_link->cpus->name = NULL;
dai_link->platforms->name = NULL;
if (num_codecs > 1 && i == card->num_links - 1) if (num_codecs > 1 && i == card->num_links - 1)
dai_index = 1; /* HDMI */ dai_index = 1; /* HDMI */
dai_link->codecs->of_node = codec_dai_node[dai_index]; dai_link->codecs->of_node = codec_dai_node[dai_index];
dai_link->cpus->of_node = cpu_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) { if (num_codecs > 1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment