summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 03:14:48 +0200
committerMark Brown <broonie@kernel.org>2019-06-19 13:48:49 +0200
commit3609750e9d4ba9db7027866827a0e462fbe86866 (patch)
treed5f882f3475c06d3ff3a3561deb6d0143404e2d8
parentASoC: atmel: atmel-pdmic: don't select unnecessary Platform (diff)
downloadlinux-3609750e9d4ba9db7027866827a0e462fbe86866.tar.xz
linux-3609750e9d4ba9db7027866827a0e462fbe86866.zip
ASoC: atmel: atmel_wm8904: 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>
-rw-r--r--sound/soc/atmel/atmel_wm8904.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c
index 084788ed328c..df5268939331 100644
--- a/sound/soc/atmel/atmel_wm8904.c
+++ b/sound/soc/atmel/atmel_wm8904.c
@@ -59,8 +59,7 @@ static const struct snd_soc_ops atmel_asoc_wm8904_ops = {
SND_SOC_DAILINK_DEFS(pcm,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
- DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8904-hifi")),
- DAILINK_COMP_ARRAY(COMP_EMPTY()));
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8904-hifi")));
static struct snd_soc_dai_link atmel_asoc_wm8904_dailink = {
.name = "WM8904",
@@ -114,7 +113,6 @@ static int atmel_asoc_wm8904_dt_init(struct platform_device *pdev)
return ret;
}
dailink->cpus->of_node = cpu_np;
- dailink->platforms->of_node = cpu_np;
of_node_put(cpu_np);
codec_np = of_parse_phandle(np, "atmel,audio-codec", 0);