openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: davinci-mcasp: Update MCASP_VERSION_4 platform driver registration 

Version 4 of McASP is using omap-pcm as platform driver and the omap-pcm
platform need to be registered using the cpu dai's device.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Peter Ujfalusi 2014-04-16 15:46:20 +03:00 committed by Mark Brown
parent ab052d465b
commit d5c6c59a9d
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sound/soc/davinci/davinci-mcasp.c
View File

@ -36,6 +36,7 @@
#include "davinci-pcm.h"
#include "davinci-mcasp.h"
#include "../omap/omap-pcm.h"
#define MCASP_MAX_AFIFO_DEPTH 64
@ -1220,12 +1221,25 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
if (ret != 0)
goto err_release_clk;
if (mcasp->version != MCASP_VERSION_4) {
switch (mcasp->version) {
case MCASP_VERSION_1:
case MCASP_VERSION_2:
case MCASP_VERSION_3:
ret = davinci_soc_platform_register(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
goto err_unregister_component;
}
break;
case MCASP_VERSION_4:
ret = omap_pcm_platform_register(&pdev->dev);
break;
default:
dev_err(&pdev->dev, "Invalid McASP version: %d\n",
mcasp->version);
ret = -EINVAL;
break;
}
if (ret) {
dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
goto err_unregister_component;
}
return 0;
@ -1243,8 +1257,19 @@ static int davinci_mcasp_remove(struct platform_device *pdev)
struct davinci_mcasp *mcasp = dev_get_drvdata(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);
if (mcasp->version != MCASP_VERSION_4)
switch (mcasp->version) {
case MCASP_VERSION_1:
case MCASP_VERSION_2:
case MCASP_VERSION_3:
davinci_soc_platform_unregister(&pdev->dev);
break;
case MCASP_VERSION_4:
/* Using the resource managed omap-pcm as platform driver */
break;
default:
break;
}
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);