diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-04-16 15:46:20 +0300 |
|---|---|---|
| committer | Darren Etheridge <detheridge@ti.com> | 2014-06-20 15:12:01 -0500 |
| commit | 5eca59bc9719f033b0389f6e0c5aea6a0c86c3f5 (patch) | |
| tree | 04be9346cb0f2a532e090566d6cb274f13292198 /sound | |
| parent | 573f371cf90e5c560e08abc5e0cf836d58f335ba (diff) | |
ASoC: davinci-mcasp: Update MCASP_VERSION_4 platform driver registration
[ Upstream commit d5c6c59a9d46113aebfd71f995b9e6e9af6a12b8 ]
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>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index af92d3e8671..d505fe7292a 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -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); |