Skip to content

Commit

Permalink
ASoC: ux500: mop500: don't select unnecessary Platform
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
morimoto authored and broonie committed Jun 19, 2019
1 parent f0edc6c commit 9ae6cdb
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions sound/soc/ux500/mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@
/* Define the whole MOP500 soundcard, linking platform to the codec-drivers */
SND_SOC_DAILINK_DEFS(link1,
DAILINK_COMP_ARRAY(COMP_CPU("ux500-msp-i2s.1")),
DAILINK_COMP_ARRAY(COMP_CODEC("ab8500-codec.0", "ab8500-codec-dai.0")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("ux500-msp-i2s.1")));
DAILINK_COMP_ARRAY(COMP_CODEC("ab8500-codec.0", "ab8500-codec-dai.0")));

SND_SOC_DAILINK_DEFS(link2,
DAILINK_COMP_ARRAY(COMP_CPU("ux500-msp-i2s.3")),
DAILINK_COMP_ARRAY(COMP_CODEC("ab8500-codec.0", "ab8500-codec-dai.1")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("ux500-msp-i2s.3")));
DAILINK_COMP_ARRAY(COMP_CODEC("ab8500-codec.0", "ab8500-codec-dai.1")));

static struct snd_soc_dai_link mop500_dai_links[] = {
{
Expand Down Expand Up @@ -91,8 +89,6 @@ static int mop500_of_probe(struct platform_device *pdev,
for (i = 0; i < 2; i++) {
mop500_dai_links[i].cpus->of_node = msp_np[i];
mop500_dai_links[i].cpus->dai_name = NULL;
mop500_dai_links[i].platforms->of_node = msp_np[i];
mop500_dai_links[i].platforms->name = NULL;
mop500_dai_links[i].codecs->of_node = codec_np;
mop500_dai_links[i].codecs->name = NULL;
}
Expand Down

0 comments on commit 9ae6cdb

Please sign in to comment.