summaryrefslogtreecommitdiff
path: root/sound/soc/atmel/sam9g20_wm8731.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 04:15:26 +0300
committerMark Brown <broonie@kernel.org>2019-06-19 14:49:28 +0300
commitbfc7938e58142a583a8141f55e453fa1bb68439d (patch)
treef84349ae4d41ad0338320d50fbc31a654a4b5d50 /sound/soc/atmel/sam9g20_wm8731.c
parent318ebbe8060d9664370c844029246f0588263fe4 (diff)
downloadlinux-bfc7938e58142a583a8141f55e453fa1bb68439d.tar.xz
ASoC: atmel: sam9g20_wm8731: 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/atmel/sam9g20_wm8731.c')
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index a5b4c3905ae8..e723153b8437 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -131,8 +131,7 @@ 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_PLATFORM("at91rm9200_ssc.0")));
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")));
static struct snd_soc_dai_link at91sam9g20ek_dai = {
.name = "WM8731",
@@ -223,14 +222,12 @@ 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);