diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2018-05-09 14:03:55 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-11 11:26:15 +0900 |
| commit | 077a403d86207080a32b5e5d60e33ee0cb628cf6 (patch) | |
| tree | b66eb742ecd12f4cc20bceca7cbf921d0838f45d /sound/soc/davinci | |
| parent | 6a7c05e55c0a3d6d4f092d734cd8fee798cf044b (diff) | |
| download | linux-077a403d86207080a32b5e5d60e33ee0cb628cf6.tar.gz linux-077a403d86207080a32b5e5d60e33ee0cb628cf6.tar.bz2 linux-077a403d86207080a32b5e5d60e33ee0cb628cf6.zip | |
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>
Diffstat (limited to 'sound/soc/davinci')
| -rw-r--r-- | sound/soc/davinci/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 6b732d8e5896..778faff28e0e 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -24,7 +24,7 @@ config SND_DAVINCI_SOC_I2S config SND_DAVINCI_SOC_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - depends on SND_OMAP_SOC || SND_EDMA_SOC + depends on SND_SDMA_SOC || SND_EDMA_SOC help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like: diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 03ba218160ca..79fc4aa2fa29 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -36,9 +36,9 @@ #include <sound/initval.h> #include <sound/soc.h> #include <sound/dmaengine_pcm.h> -#include <sound/omap-pcm.h> #include "edma-pcm.h" +#include "../omap/sdma-pcm.h" #include "davinci-mcasp.h" #define MCASP_MAX_AFIFO_DEPTH 64 @@ -2048,10 +2048,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) #endif break; 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_OMAP_SOC)) - ret = omap_pcm_platform_register(&pdev->dev); + IS_MODULE(CONFIG_SND_SDMA_SOC)) + ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL); #else dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n"); ret = -EINVAL; |