summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-18 21:14:23 -0400
committerMark Brown <broonie@kernel.org>2019-06-19 07:48:10 -0400
commit02602401e53168a66d9c5fbf0b16bae0826f8145 (patch)
tree39cc6ebe26bd3a5cc08cd3993489e1f6bfa3f687 /sound/soc/atmel
parent6c6de1c9e2bf2a0901ca1f2a169d1a2f9fd27958 (diff)
ASoC: atmel: atmel-classd: 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/atmel')
-rw-r--r--sound/soc/atmel/atmel-classd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index cfebbeb92ef1..06111f27b229 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -506,24 +506,21 @@ static int atmel_classd_asoc_card_init(struct device *dev,
506 if (!dai_link) 506 if (!dai_link)
507 return -ENOMEM; 507 return -ENOMEM;
508 508
509 comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL); 509 comp = devm_kzalloc(dev, 2 * sizeof(*comp), GFP_KERNEL);
510 if (!comp) 510 if (!comp)
511 return -ENOMEM; 511 return -ENOMEM;
512 512
513 dai_link->cpus = &comp[0]; 513 dai_link->cpus = &comp[0];
514 dai_link->codecs = &comp[1]; 514 dai_link->codecs = &comp[1];
515 dai_link->platforms = &comp[2];
516 515
517 dai_link->num_cpus = 1; 516 dai_link->num_cpus = 1;
518 dai_link->num_codecs = 1; 517 dai_link->num_codecs = 1;
519 dai_link->num_platforms = 1;
520 518
521 dai_link->name = "CLASSD"; 519 dai_link->name = "CLASSD";
522 dai_link->stream_name = "CLASSD PCM"; 520 dai_link->stream_name = "CLASSD PCM";
523 dai_link->codecs->dai_name = ATMEL_CLASSD_CODEC_DAI_NAME; 521 dai_link->codecs->dai_name = ATMEL_CLASSD_CODEC_DAI_NAME;
524 dai_link->cpus->dai_name = dev_name(dev); 522 dai_link->cpus->dai_name = dev_name(dev);
525 dai_link->codecs->name = dev_name(dev); 523 dai_link->codecs->name = dev_name(dev);
526 dai_link->platforms->name = dev_name(dev);
527 524
528 card->dai_link = dai_link; 525 card->dai_link = dai_link;
529 card->num_links = 1; 526 card->num_links = 1;