summaryrefslogtreecommitdiff
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 04:17:51 +0300
committerMark Brown <broonie@kernel.org>2019-06-19 14:53:04 +0300
commit9c21e82c165c009563928f4c0fe21a579352ae5b (patch)
tree3c2e53d8d379402ee9fa2d6c863c9deb7d1f7801 /sound/soc/rockchip
parent3caf11fa88a954916c14c719b89478f4d89386d5 (diff)
downloadlinux-9c21e82c165c009563928f4c0fe21a579352ae5b.tar.xz
ASoC: rockchip: rk3288_hdmi_analog: 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/rk3288_hdmi_analog.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c
index 71ee16d7bde6..7e4bf3323fb1 100644
--- a/sound/soc/rockchip/rk3288_hdmi_analog.c
+++ b/sound/soc/rockchip/rk3288_hdmi_analog.c
@@ -154,8 +154,7 @@ static const struct snd_soc_ops rk_ops = {
SND_SOC_DAILINK_DEFS(audio,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, NULL),
- COMP_CODEC("hdmi-audio-codec.2.auto", "i2s-hifi")),
- DAILINK_COMP_ARRAY(COMP_EMPTY()));
+ COMP_CODEC("hdmi-audio-codec.2.auto", "i2s-hifi")));
static struct snd_soc_dai_link rk_dailink = {
.name = "Codecs",
@@ -249,8 +248,6 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
return -EINVAL;
}
- rk_dailink.platforms->of_node = rk_dailink.cpus->of_node;
-
ret = snd_soc_of_parse_audio_routing(card, "rockchip,routing");
if (ret) {
dev_err(&pdev->dev,