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

Use the new platform driver.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 292e53cfc02b832ae1e48edcaffe4b3e1cc818f8..a8319aaba97d77e1c16d080e0e98c6c9929fbad2 100644 (file)
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -35,7 +35,7 @@ config SND_OMAP_SOC_HDMI_AUDIO
 
 config SND_OMAP_SOC_N810
        tristate "SoC Audio support for Nokia N810"
-       depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
+       depends on SND_SDMA_SOC && MACH_NOKIA_N810 && I2C
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TLV320AIC3X
        help
@@ -43,7 +43,7 @@ config SND_OMAP_SOC_N810
 
 config SND_OMAP_SOC_RX51
        tristate "SoC Audio support for Nokia N900 (RX-51)"
-       depends on SND_OMAP_SOC && ARM && I2C
+       depends on SND_SDMA_SOC && ARM && I2C
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TLV320AIC3X
        select SND_SOC_TPA6130A2
@@ -54,7 +54,7 @@ config SND_OMAP_SOC_RX51
 
 config SND_OMAP_SOC_AMS_DELTA
        tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
-       depends on SND_OMAP_SOC && MACH_AMS_DELTA && TTY
+       depends on SND_SDMA_SOC && MACH_AMS_DELTA && TTY
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_CX20442
        help
@@ -73,7 +73,7 @@ config SND_OMAP_SOC_AMS_DELTA
 
 config SND_OMAP_SOC_OSK5912
        tristate "SoC Audio support for omap osk5912"
-       depends on SND_OMAP_SOC && MACH_OMAP_OSK && I2C
+       depends on SND_SDMA_SOC && MACH_OMAP_OSK && I2C
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TLV320AIC23_I2C
        help
@@ -81,7 +81,7 @@ config SND_OMAP_SOC_OSK5912
 
 config SND_OMAP_SOC_AM3517EVM
        tristate "SoC Audio support for OMAP3517 / AM3517 EVM"
-       depends on SND_OMAP_SOC && MACH_OMAP3517EVM && I2C
+       depends on SND_SDMA_SOC && MACH_OMAP3517EVM && I2C
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TLV320AIC23_I2C
        help
@@ -90,7 +90,7 @@ config SND_OMAP_SOC_AM3517EVM
 
 config SND_OMAP_SOC_OMAP_TWL4030
        tristate "SoC Audio support for TI SoC based boards with twl4030 codec"
-       depends on TWL4030_CORE && SND_OMAP_SOC
+       depends on TWL4030_CORE && SND_SDMA_SOC
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TWL4030
        help
@@ -123,7 +123,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040
 
 config SND_OMAP_SOC_OMAP3_PANDORA
        tristate "SoC Audio support for OMAP3 Pandora"
-       depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_PANDORA
+       depends on TWL4030_CORE && SND_SDMA_SOC && MACH_OMAP3_PANDORA
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TWL4030
        help

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 6b40bdbef336952084c1d88fbe64d767121f37a8..d0ebb6b9bfac3a38ed320cb957a32cb71788b418 100644 (file)
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -34,11 +34,11 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
-#include <sound/omap-pcm.h>
 
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
+#include "sdma-pcm.h"
 
 #define OMAP_MCBSP_RATES       (SNDRV_PCM_RATE_8000_96000)
 
@@ -868,7 +868,7 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       return omap_pcm_platform_register(&pdev->dev);
+       return sdma_pcm_platform_register(&pdev->dev, NULL, NULL);
 }
 
 static int asoc_mcbsp_remove(struct platform_device *pdev)