[alsa-devel] [PATCH v2 5/7] ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm

[Peter Ujfalusi]

Use the new platform driver.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi at ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula at bitmer.com>
---
 sound/soc/omap/Kconfig      | 4 ++--
 sound/soc/omap/omap-mcpdm.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 19413afc3b23..6a60a8926ecf 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -25,7 +25,7 @@ config SND_OMAP_SOC_MCBSP
 
 config SND_OMAP_SOC_MCPDM
 	tristate "TI Multichannel PDM Controller (McPDM) support"
-	depends on SND_OMAP_SOC && (ARCH_OMAP4 || SOC_OMAP5)
+	depends on SND_SDMA_SOC && (ARCH_OMAP4 || SOC_OMAP5)
 	help
 	  Say Y or M here if you want to have support for McPDM IP found in
 	  OMAP4 and OMAP5.
@@ -117,7 +117,7 @@ config SND_OMAP_SOC_OMAP_TWL4030
 
 config SND_OMAP_SOC_OMAP_ABE_TWL6040
 	tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
-	depends on TWL6040_CORE && SND_OMAP_SOC && SND_SDMA_SOC && COMMON_CLK
+	depends on TWL6040_CORE && SND_SDMA_SOC && COMMON_CLK
 	depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
 	select SND_OMAP_SOC_DMIC
 	select SND_OMAP_SOC_MCPDM
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 04f4f3cb0f46..3f3e7c4ee175 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -41,9 +41,9 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
-#include <sound/omap-pcm.h>
 
 #include "omap-mcpdm.h"
+#include "sdma-pcm.h"
 
 struct mcpdm_link_config {
 	u32 link_mask; /* channel mask for the direction */
@@ -565,7 +565,7 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return omap_pcm_platform_register(&pdev->dev);
+	return sdma_pcm_platform_register(&pdev->dev, "dn_link", "up_link");
 }
 
 static const struct of_device_id omap_mcpdm_of_match[] = {
-- 
Peter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki