diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-19 03:19:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-19 13:59:01 +0200 |
| commit | 961fb3c206dc84febe87cc433ca321eb6587ec66 (patch) | |
| tree | b8a2859a329697c8360fd83f0970b3390dd1885c /sound/soc/rockchip/rk3399_gru_sound.c | |
| parent | ASoC: qcom: don't select unnecessary Platform (diff) | |
| download | linux-961fb3c206dc84febe87cc433ca321eb6587ec66.tar.xz linux-961fb3c206dc84febe87cc433ca321eb6587ec66.zip | |
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>
Diffstat (limited to 'sound/soc/rockchip/rk3399_gru_sound.c')
| -rw-r--r-- | sound/soc/rockchip/rk3399_gru_sound.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 5e2700283fa8..879069fc0b94 100644 --- 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 > |