summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel/sam9x5_wm8731.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-28 03:47:06 +0200
committerMark Brown <broonie@kernel.org>2019-06-28 16:10:41 +0200
commite1be6aa0984e8b3d1aeccda527360f9c7c9ff54f (patch)
treec2dfae18673bd1a6938900b31bc851b674a84c3c /sound/soc/atmel/sam9x5_wm8731.c
parentASoC: atmel: sam9g20_wm8731: consider CPU-Platform possibility (diff)
downloadlinux-e1be6aa0984e8b3d1aeccda527360f9c7c9ff54f.tar.xz
linux-e1be6aa0984e8b3d1aeccda527360f9c7c9ff54f.zip
ASoC: atmel: sam9x5_wm8731: consider CPU-Platform possibility
commit ced5b08020cd ("ASoC: atmel: sam9x5_wm8731: 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 ced5b08020cd ("ASoC: atmel: sam9x5_wm8731: 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/sam9x5_wm8731.c')
-rw-r--r--sound/soc/atmel/sam9x5_wm8731.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c
index d2dc344ff0a8..7822425d5e61 100644
--- a/sound/soc/atmel/sam9x5_wm8731.c
+++ b/sound/soc/atmel/sam9x5_wm8731.c
@@ -88,7 +88,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL);
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
dai = devm_kzalloc(&pdev->dev, sizeof(*dai), GFP_KERNEL);
- comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);
+ comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
if (!dai || !card || !priv || !comp) {
ret = -ENOMEM;
goto out;
@@ -107,6 +107,8 @@ static int sam9x5_wm8731_driver_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 PCM";
@@ -143,6 +145,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
goto out;
}
dai->cpus->of_node = cpu_np;
+ dai->platforms->of_node = cpu_np;
priv->ssc_id = of_alias_get_id(cpu_np, "ssc");