ASoC: omap-hdmi-audio: 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 2576fc92bff7edfc04ea3381381be51c31411353..829b5515b3c5cfbf441f0a294741ac6686a533e7 100644 (file)
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -20,7 +20,7 @@ config SND_OMAP_SOC_MCPDM
 
 config SND_OMAP_SOC_HDMI_AUDIO
        tristate "HDMI audio support for OMAP4+ based SoCs"
-       depends on SND_OMAP_SOC
+       depends on SND_SDMA_SOC
        help
          For HDMI audio to work OMAPDSS HDMI support should be
          enabled.

diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index 8eeac7cab1c1945742c5307d8b40b05f63842bfe..8a99a8837dc9a48dc86a40883c0010ac7f239930 100644 (file)
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -26,9 +26,10 @@
 #include <sound/dmaengine_pcm.h>
 #include <uapi/sound/asound.h>
 #include <sound/asoundef.h>
-#include <sound/omap-pcm.h>
 #include <sound/omap-hdmi-audio.h>
 
+#include "sdma-pcm.h"
+
 #define DRV_NAME "omap-hdmi-audio"
 
 struct hdmi_audio_data {
@@ -352,7 +353,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = omap_pcm_platform_register(ad->dssdev);
+       ret = sdma_pcm_platform_register(ad->dssdev, "audio_tx", NULL);
        if (ret)
                return ret;