summaryrefslogtreecommitdiff
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 04:17:55 +0300
committerMark Brown <broonie@kernel.org>2019-06-19 14:53:22 +0300
commit7df405ae58953a6e880921d1948c33cd357c6ed4 (patch)
treec31b9d04643a0e5e49e478e5a8472ce1a20dbf61 /sound/soc/rockchip
parent9c21e82c165c009563928f4c0fe21a579352ae5b (diff)
downloadlinux-7df405ae58953a6e880921d1948c33cd357c6ed4.tar.xz
ASoC: rockchip: rockchip_max98090: 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/rockchip')
-rw-r--r--sound/soc/rockchip/rockchip_max98090.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index fcb5c06a0fe2..6b58f3b97ded 100644
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -125,8 +125,7 @@ static const struct snd_soc_ops rk_aif1_ops = {
SND_SOC_DAILINK_DEFS(hifi,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
- DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")),
- DAILINK_COMP_ARRAY(COMP_EMPTY()));
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")));
static struct snd_soc_dai_link rk_dailink = {
.name = "max98090",
@@ -205,8 +204,6 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
return -EINVAL;
}
- rk_dailink.platforms->of_node = rk_dailink.cpus->of_node;
-
rk_98090_headset_dev.codec_of_node = of_parse_phandle(np,
"rockchip,headset-codec", 0);
if (!rk_98090_headset_dev.codec_of_node) {