summaryrefslogtreecommitdiff
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-28 10:46:49 +0900
committerMark Brown <broonie@kernel.org>2019-06-28 15:10:11 +0100
commit716407ea57fa38fc1b04c699f1b83847cf669872 (patch)
tree2b21320df2ba81dc0286f3a703ad66aa36ccd708 /sound/soc/atmel
parent16589b77a95668b0046658188ea55684709768c2 (diff)
ASoC: amtel: mikroe-proto: consider CPU-Platform possibility
commit 318ebbe8060d96 ("ASoC: atmel: mikroe-proto: don't select unnecessary Platform") Current ALSA SoC avoid to add duplicate component to rtd, and this driver was selecting CPU component as Platform component. Thus, above patch removed Platform settings from this driver, because it assumed these are same component. But, some CPU driver is using generic DMAEngine, in such case, both CPU component and Platform component will have same of_node/name. In other words, there are some components which are different but have same of_node/name. In such case, Card driver definitely need to select Platform even though it is same as CPU. It is depends on CPU driver, but is difficult to know it from Card driver. This patch reverts above patch. Fixes: commit 318ebbe8060d96 ("ASoC: atmel: mikroe-proto: don't select unnecessary Platform") 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/mikroe-proto.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index 954b24e23730..aa6d0d78566f 100644
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -85,8 +85,8 @@ static int snd_proto_probe(struct platform_device *pdev)
if (!dai)
return -ENOMEM;
- /* for cpus/codecs */
- comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);
+ /* for cpus/codecs/platforms */
+ comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
if (!comp)
return -ENOMEM;
@@ -97,6 +97,8 @@ static int snd_proto_probe(struct platform_device *pdev)
dai->num_cpus = 1;
dai->codecs = &comp[1];
dai->num_codecs = 1;
+ dai->platforms = &comp[2];
+ dai->num_platforms = 1;
dai->name = "WM8731";
dai->stream_name = "WM8731 HiFi";
@@ -116,6 +118,7 @@ static int snd_proto_probe(struct platform_device *pdev)
return -EINVAL;
}
dai->cpus->of_node = cpu_np;
+ dai->platforms->of_node = cpu_np;
dai_fmt = snd_soc_of_parse_daifmt(np, NULL,
&bitclkmaster, &framemaster);