mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-19 10:18:17 +09:00 committed by Mark Brown
parent a555b6a959
commit ae7cbcc43b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/samsung/tm2_wm5110.c
View File

@ -429,21 +429,17 @@ 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_EMPTY()));
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif1")));
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_EMPTY()));
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif2")));
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_EMPTY()));
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif3")));
SND_SOC_DAILINK_DEFS(hdmi,
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)
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) {