summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 10:19:28 +0900
committerMark Brown <broonie@kernel.org>2019-06-19 12:58:21 +0100
commit9ae6cdb184b651bf48b9feed4f947468ff1c3c1f (patch)
treefcd52a5b0035c59f672b360a70d856c81026bb92
parentf0edc6c1ee48c947d762b0e21b8d3f61858f47f0 (diff)
downloadlinux-9ae6cdb184b651bf48b9feed4f947468ff1c3c1f.tar.gz
linux-9ae6cdb184b651bf48b9feed4f947468ff1c3c1f.tar.bz2
linux-9ae6cdb184b651bf48b9feed4f947468ff1c3c1f.zip
ASoC: ux500: mop500: 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>
-rw-r--r--sound/soc/ux500/mop500.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index 20552e9d9217..12b2260efaf4 100644
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -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[] = {
{
@@ -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;
}