bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-07-12 00:43:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: rockchip: rk3399_gru_sound: don't select unnecessary Platform

Browse source 
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>
This commit is contained in:
Kuninori Morimoto 2019-06-19 10:19:40 +09:00 • committed by Mark Brown
parent 0814c64129
commit 961fb3c206
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sound/soc/rockchip/rk3399_gru_sound.c
View file

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