ASoC: rockchip: rk3399_gru_sound: 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>

diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 5e2700283fa89cf22c37f0688537051fde12a353..879069fc0b941d157c14fb9a32b9147f8ae8b683 100644 (file)
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -278,33 +278,27 @@ enum {
 
 SND_SOC_DAILINK_DEFS(cdndp,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "spdif-hifi")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "spdif-hifi")));
 
 SND_SOC_DAILINK_DEFS(da7219,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "da7219-hifi")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "da7219-hifi")));
 
 SND_SOC_DAILINK_DEFS(dmic,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dmic-hifi")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dmic-hifi")));
 
 SND_SOC_DAILINK_DEFS(max98357a,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")));
 
 SND_SOC_DAILINK_DEFS(rt5514,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5514-aif1")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5514-aif1")));
 
 SND_SOC_DAILINK_DEFS(rt5514_dsp,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_DUMMY()),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_DUMMY()));
 
 static const struct snd_soc_dai_link rockchip_dais[] = {
        [DAILINK_CDNDP] = {
@@ -538,7 +532,6 @@ static int rockchip_sound_of_parse_dais(struct device *dev,
 
                if (!dai->codecs->name)
                        dai->codecs->of_node = np_codec;
-               dai->platforms->of_node = np_cpu;
                dai->cpus->of_node = np_cpu;
 
                if (card->num_dapm_routes + rockchip_routes[index].num_routes >