UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: davinci-mcasp: Convert to use the sdma-pcm instead of omap-pcm 

Use the new platform driver in case of sDMA.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2018-05-09 14:03:55 +03:00 committed by Mark Brown
parent 6a7c05e55c
commit 077a403d86
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/davinci/Kconfig
View File

@ -24,7 +24,7 @@ config SND_DAVINCI_SOC_I2S
config SND_DAVINCI_SOC_MCASP config SND_DAVINCI_SOC_MCASP
tristate "Multichannel Audio Serial Port (McASP) support" tristate "Multichannel Audio Serial Port (McASP) support"
depends on SND_OMAP_SOC || SND_EDMA_SOC depends on SND_SDMA_SOC || SND_EDMA_SOC
help help
Say Y or M here if you want to have support for McASP IP found in Say Y or M here if you want to have support for McASP IP found in
various Texas Instruments SoCs like: various Texas Instruments SoCs like:

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

@ -36,9 +36,9 @@
#include <sound/initval.h> #include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
#include <sound/omap-pcm.h>
#include "edma-pcm.h" #include "edma-pcm.h"
#include "../omap/sdma-pcm.h"
#include "davinci-mcasp.h" #include "davinci-mcasp.h"
#define MCASP_MAX_AFIFO_DEPTH 64 #define MCASP_MAX_AFIFO_DEPTH 64
@ -2048,10 +2048,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
#endif #endif
break; break;
case PCM_SDMA: case PCM_SDMA:
#if IS_BUILTIN(CONFIG_SND_OMAP_SOC) || \ #if IS_BUILTIN(CONFIG_SND_SDMA_SOC) || \
(IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \ (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \
IS_MODULE(CONFIG_SND_OMAP_SOC)) IS_MODULE(CONFIG_SND_SDMA_SOC))
ret = omap_pcm_platform_register(&pdev->dev); ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL);
#else #else
dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n"); dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n");
ret = -EINVAL; ret = -EINVAL;