|
@@ -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;
|