summaryrefslogtreecommitdiff
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 04:18:17 +0300
committerMark Brown <broonie@kernel.org>2019-06-19 14:54:56 +0300
commitae7cbcc43b8c275b9f9b2491144110d260cd6b18 (patch)
tree6f2c20dd2521671fb43cbb10be87eccc367077cf /sound/soc/samsung
parenta555b6a959e6a1539d8a1dc6a48d5c8920d7724e (diff)
downloadlinux-ae7cbcc43b8c275b9f9b2491144110d260cd6b18.tar.xz
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>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/tm2_wm5110.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
index c091033d17ad..a80781031f62 100644
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -429,22 +429,18 @@ 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()));
static struct snd_soc_dai_link tm2_dai_links[] = {
@@ -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) {