ASoC: davinci-mcasp: Register eDMA platform driver for DRA7xx

McASP in DRA7xx SoC family (VERSION_4) can use either sDMA
or eDMA.  In order to be able to use either DMA controller
make sure their corresponding platform driver is registered.

Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>

diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index 767f09d79e56d7fc6c46b674e250ffac1e7b2a23..e239b3f9fff40036755767a768dc2f569182345d 100644 (file)
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -4,7 +4,7 @@ config SND_DAVINCI_SOC
 
 config SND_EDMA_SOC
        tristate "SoC Audio for Texas Instruments chips using eDMA (AM33XX/43XX)"
-       depends on SOC_AM33XX || SOC_AM43XX
+       depends on SOC_AM33XX || SOC_AM43XX || SOC_DRA7XX
        select SND_SOC_GENERIC_DMAENGINE_PCM
        help
          Say Y or M here if you want audio support for TI SoC which uses eDMA.

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index ac8bc037f03ffbf1684057583cb6d1ac9e3625a9..2bd9e6c7990537eeff2ef4266492a3889f682e73 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1867,6 +1867,13 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \
         IS_MODULE(CONFIG_SND_OMAP_SOC))
        case MCASP_VERSION_4:
+               ret = edma_pcm_platform_register(&pdev->dev);
+               if (ret) {
+                       dev_err(&pdev->dev, "register eDMA PCM failed: %d\n",
+                               ret);
+                       goto err;
+               }
+
                ret = omap_pcm_platform_register(&pdev->dev);
                break;
 #endif