16 files changed, 122 insertions, 227 deletions

diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index c1900b2a6f28..994dcf345975 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -28,7 +28,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #include "../codecs/tlv320aic23.h"
 
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 2600447fa74f..629446482a91 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -36,7 +36,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 #include "../codecs/cx20442.h"
 
 
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 285c8368cb47..eb68c7db1cf3 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -1018,9 +1018,10 @@ int omap_mcbsp_init(struct platform_device *pdev)
                 return -ENODEV;
         }
         /* RX DMA request number, and port address configuration */
-        mcbsp->dma_data[1].name = "Audio Capture";
-        mcbsp->dma_data[1].dma_req = res->start;
-        mcbsp->dma_data[1].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 1);
+        mcbsp->dma_req[1] = res->start;
+        mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];
+        mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp, 1);
+        mcbsp->dma_data[1].maxburst = 4;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
         if (!res) {
@@ -1028,9 +1029,10 @@ int omap_mcbsp_init(struct platform_device *pdev)
                 return -ENODEV;
         }
         /* TX DMA request number, and port address configuration */
-        mcbsp->dma_data[0].name = "Audio Playback";
-        mcbsp->dma_data[0].dma_req = res->start;
-        mcbsp->dma_data[0].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 0);
+        mcbsp->dma_req[0] = res->start;
+        mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];
+        mcbsp->dma_data[0].addr = omap_mcbsp_dma_reg_params(mcbsp, 0);
+        mcbsp->dma_data[0].maxburst = 4;
 
         mcbsp->fclk = clk_get(&pdev->dev, "fck");
         if (IS_ERR(mcbsp->fclk)) {
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index f93e0b0af303..96d1b086bcf8 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -24,14 +24,14 @@
 #ifndef __ASOC_MCBSP_H
 #define __ASOC_MCBSP_H
 
-#include "omap-pcm.h"
-
 #ifdef CONFIG_ARCH_OMAP1
 #define mcbsp_omap1()   1
 #else
 #define mcbsp_omap1()   0
 #endif
 
+#include <sound/dmaengine_pcm.h>
+
 /* McBSP register numbers. Register address offset = num * reg_step */
 enum {
         /* Common registers */
@@ -312,7 +312,8 @@ struct omap_mcbsp {
         struct omap_mcbsp_platform_data *pdata;
         struct omap_mcbsp_st_data *st_data;
         struct omap_mcbsp_reg_cfg cfg_regs;
-        struct omap_pcm_dma_data dma_data[2];
+        struct snd_dmaengine_dai_dma_data dma_data[2];
+        unsigned int dma_req[2];
         int dma_op_mode;
         u16 max_tx_thres;
         u16 max_rx_thres;
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index ee7cd53aa3ee..5e8d640d314f 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -34,7 +34,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define N810_HEADSET_AMP_GPIO   10
 #define N810_SPEAKER_AMP_GPIO   101
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index e7d93fa412a9..70cd5c7b2e14 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -34,7 +34,6 @@
 
 #include "omap-dmic.h"
 #include "omap-mcpdm.h"
-#include "omap-pcm.h"
 #include "../codecs/twl6040.h"
 
 struct abe_twl6040 {
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 4c54542895b0..2ad0370146fd 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -39,8 +39,8 @@
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
-#include "omap-pcm.h"
 #include "omap-dmic.h"
 
 struct omap_dmic {
@@ -55,13 +55,9 @@ struct omap_dmic {
         u32 ch_enabled;
         bool active;
         struct mutex mutex;
-};
 
-/*
- * Stream DMA parameters
- */
-static struct omap_pcm_dma_data omap_dmic_dai_dma_params = {
-        .name           = "DMIC capture",
+        struct snd_dmaengine_dai_dma_data dma_data;
+        unsigned int dma_req;
 };
 
 static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
@@ -118,7 +114,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
 
         mutex_unlock(&dmic->mutex);
 
-        snd_soc_dai_set_dma_data(dai, substream, &omap_dmic_dai_dma_params);
+        snd_soc_dai_set_dma_data(dai, substream, &dmic->dma_data);
         return ret;
 }
 
@@ -203,7 +199,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
                                     struct snd_soc_dai *dai)
 {
         struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai);
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
         int channels;
 
         dmic->clk_div = omap_dmic_select_divider(dmic, params_rate(params));
@@ -230,7 +226,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
 
         /* packet size is threshold * channels */
         dma_data = snd_soc_dai_get_dma_data(dai, substream);
-        dma_data->packet_size = dmic->threshold * channels;
+        dma_data->maxburst = dmic->threshold * channels;
 
         return 0;
 }
@@ -480,7 +476,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto err_put_clk;
         }
-        omap_dmic_dai_dma_params.port_addr = res->start + OMAP_DMIC_DATA_REG;
+        dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG;
 
         res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         if (!res) {
@@ -488,7 +484,9 @@ static int asoc_dmic_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto err_put_clk;
         }
-        omap_dmic_dai_dma_params.dma_req = res->start;
+
+        dmic->dma_req = res->start;
+        dmic->dma_data.filter_data = &dmic->dma_req;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
         if (!res) {
@@ -497,19 +495,9 @@ static int asoc_dmic_probe(struct platform_device *pdev)
                 goto err_put_clk;
         }
 
-        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     resource_size(res), pdev->name)) {
-                dev_err(dmic->dev, "memory region already claimed\n");
-                ret = -ENODEV;
-                goto err_put_clk;
-        }
-
-        dmic->io_base = devm_ioremap(&pdev->dev, res->start,
-                                     resource_size(res));
-        if (!dmic->io_base) {
-                ret = -ENOMEM;
-                goto err_put_clk;
-        }
+        dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(dmic->io_base))
+                return PTR_ERR(dmic->io_base);
 
         ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,
                                          &omap_dmic_dai, 1);
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 7e120ccc20e1..ced3b88b44d4 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -32,15 +32,16 @@
 #include <sound/soc.h>
 #include <sound/asound.h>
 #include <sound/asoundef.h>
+#include <sound/dmaengine_pcm.h>
 #include <video/omapdss.h>
 
-#include "omap-pcm.h"
 #include "omap-hdmi.h"
 
 #define DRV_NAME "omap-hdmi-audio-dai"
 
 struct hdmi_priv {
-        struct omap_pcm_dma_data dma_params;
+        struct snd_dmaengine_dai_dma_data dma_data;
+        unsigned int dma_req;
         struct omap_dss_audio dss_audio;
         struct snd_aes_iec958 iec;
         struct snd_cea_861_aud_if cea;
@@ -68,7 +69,7 @@ static int omap_hdmi_dai_startup(struct snd_pcm_substream *substream,
                 return -ENODEV;
         }
 
-        snd_soc_dai_set_dma_data(dai, substream, &priv->dma_params);
+        snd_soc_dai_set_dma_data(dai, substream, &priv->dma_data);
 
         return 0;
 }
@@ -88,25 +89,20 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
         struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai);
         struct snd_aes_iec958 *iec = &priv->iec;
         struct snd_cea_861_aud_if *cea = &priv->cea;
-        struct omap_pcm_dma_data *dma_data;
         int err = 0;
 
-        dma_data = snd_soc_dai_get_dma_data(dai, substream);
-
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
-                dma_data->packet_size = 16;
+                priv->dma_data.maxburst = 16;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
-                dma_data->packet_size = 32;
+                priv->dma_data.maxburst = 32;
                 break;
         default:
                 dev_err(dai->dev, "format not supported!\n");
                 return -EINVAL;
         }
 
-        dma_data->data_type = 32;
-
         /*
          * fill the IEC-60958 channel status word
          */
@@ -287,8 +283,7 @@ static int omap_hdmi_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        hdmi_data->dma_params.port_addr =  hdmi_rsrc->start
-                + OMAP_HDMI_AUDIO_DMA_PORT;
+        hdmi_data->dma_data.addr = hdmi_rsrc->start + OMAP_HDMI_AUDIO_DMA_PORT;
 
         hdmi_rsrc = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         if (!hdmi_rsrc) {
@@ -296,8 +291,9 @@ static int omap_hdmi_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        hdmi_data->dma_params.dma_req =  hdmi_rsrc->start;
-        hdmi_data->dma_params.name = "HDMI playback";
+        hdmi_data->dma_req = hdmi_rsrc->start;
+        hdmi_data->dma_data.filter_data = &hdmi_data->dma_req;
+        hdmi_data->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 
         /*
          * TODO: We assume that there is only one DSS HDMI device. Future
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index f51685d72fdb..eadbfb6b5000 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -33,11 +33,11 @@
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define OMAP_MCBSP_RATES        (SNDRV_PCM_RATE_8000_96000)
 
@@ -62,24 +62,22 @@ enum {
  * Stream DMA parameters. DMA request line and port address are set runtime
  * since they are different between OMAP1 and later OMAPs
  */
-static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream)
+static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream,
+                unsigned int packet_size)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
-        struct omap_pcm_dma_data *dma_data;
         int words;
 
-        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
         /*
          * Configure McBSP threshold based on either:
          * packet_size, when the sDMA is in packet mode, or based on the
          * period size in THRESHOLD mode, otherwise use McBSP threshold = 1
          * for mono streams.
          */
-        if (dma_data->packet_size)
-                words = dma_data->packet_size;
+        if (packet_size)
+                words = packet_size;
         else
                 words = 1;
 
@@ -226,7 +224,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
 {
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
         struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs;
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
         int wlen, channels, wpf;
         int pkt_size = 0;
         unsigned int format, div, framesize, master;
@@ -245,7 +243,6 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
         if (mcbsp->pdata->buffer_size) {
-                dma_data->set_threshold = omap_mcbsp_set_threshold;
                 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {
                         int period_words, max_thrsh;
                         int divider = 0;
@@ -276,9 +273,10 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                         /* Use packet mode for non mono streams */
                         pkt_size = channels;
                 }
+                omap_mcbsp_set_threshold(substream, pkt_size);
         }
 
-        dma_data->packet_size = pkt_size;
+        dma_data->maxburst = pkt_size;
 
         if (mcbsp->configured) {
                 /* McBSP already configured by another stream */
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 4cc98071aa91..eb05c7ed6d05 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -39,11 +39,14 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "omap-mcpdm.h"
-#include "omap-pcm.h"
 
-#define OMAP44XX_MCPDM_L3_BASE          0x49032000
+struct mcpdm_link_config {
+        u32 link_mask; /* channel mask for the direction */
+        u32 threshold; /* FIFO threshold */
+};
 
 struct omap_mcpdm {
         struct device *dev;
@@ -53,29 +56,22 @@ struct omap_mcpdm {
 
         struct mutex mutex;
 
-        /* channel data */
-        u32 dn_channels;
-        u32 up_channels;
-
-        /* McPDM FIFO thresholds */
-        u32 dn_threshold;
-        u32 up_threshold;
+        /* Playback/Capture configuration */
+        struct mcpdm_link_config config[2];
 
         /* McPDM dn offsets for rx1, and 2 channels */
         u32 dn_rx_offset;
+
+        /* McPDM needs to be restarted due to runtime reconfiguration */
+        bool restart;
+
+        struct snd_dmaengine_dai_dma_data dma_data[2];
+        unsigned int dma_req[2];
 };
 
 /*
  * Stream DMA parameters
  */
-static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = {
-        {
-                .name = "Audio playback",
-        },
-        {
-                .name = "Audio capture",
-        },
-};
 
 static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, u16 reg, u32 val)
 {
@@ -130,11 +126,12 @@ static void omap_mcpdm_reg_dump(struct omap_mcpdm *mcpdm) {}
 static void omap_mcpdm_start(struct omap_mcpdm *mcpdm)
 {
         u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+        u32 link_mask = mcpdm->config[0].link_mask | mcpdm->config[1].link_mask;
 
         ctrl |= (MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
-        ctrl |= mcpdm->dn_channels | mcpdm->up_channels;
+        ctrl |= link_mask;
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
         ctrl &= ~(MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
@@ -148,11 +145,12 @@ static void omap_mcpdm_start(struct omap_mcpdm *mcpdm)
 static void omap_mcpdm_stop(struct omap_mcpdm *mcpdm)
 {
         u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+        u32 link_mask = MCPDM_PDM_DN_MASK | MCPDM_PDM_UP_MASK;
 
         ctrl |= (MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
-        ctrl &= ~(mcpdm->dn_channels | mcpdm->up_channels);
+        ctrl &= ~(link_mask);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
         ctrl &= ~(MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
@@ -188,8 +186,10 @@ static void omap_mcpdm_open_streams(struct omap_mcpdm *mcpdm)
                 omap_mcpdm_write(mcpdm, MCPDM_REG_DN_OFFSET, dn_offset);
         }
 
-        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_DN, mcpdm->dn_threshold);
-        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_UP, mcpdm->up_threshold);
+        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_DN,
+                         mcpdm->config[SNDRV_PCM_STREAM_PLAYBACK].threshold);
+        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_UP,
+                         mcpdm->config[SNDRV_PCM_STREAM_CAPTURE].threshold);
 
         omap_mcpdm_write(mcpdm, MCPDM_REG_DMAENABLE_SET,
                         MCPDM_DMA_DN_ENABLE | MCPDM_DMA_UP_ENABLE);
@@ -267,7 +267,7 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
         mutex_unlock(&mcpdm->mutex);
 
         snd_soc_dai_set_dma_data(dai, substream,
-                                 &omap_mcpdm_dai_dma_params[substream->stream]);
+                                 &mcpdm->dma_data[substream->stream]);
 
         return 0;
 }
@@ -283,6 +283,8 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
                 if (omap_mcpdm_active(mcpdm)) {
                         omap_mcpdm_stop(mcpdm);
                         omap_mcpdm_close_streams(mcpdm);
+                        mcpdm->config[0].link_mask = 0;
+                        mcpdm->config[1].link_mask = 0;
                 }
         }
 
@@ -295,7 +297,8 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
 {
         struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);
         int stream = substream->stream;
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
+        u32 threshold;
         int channels;
         int link_mask = 0;
 
@@ -325,16 +328,32 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
 
         dma_data = snd_soc_dai_get_dma_data(dai, substream);
 
+        threshold = mcpdm->config[stream].threshold;
         /* Configure McPDM channels, and DMA packet size */
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                mcpdm->dn_channels = link_mask << 3;
-                dma_data->packet_size =
-                        (MCPDM_DN_THRES_MAX - mcpdm->dn_threshold) * channels;
+                link_mask <<= 3;
+
+                /* If capture is not running assume a stereo stream to come */
+                if (!mcpdm->config[!stream].link_mask)
+                        mcpdm->config[!stream].link_mask = 0x3;
+
+                dma_data->maxburst =
+                                (MCPDM_DN_THRES_MAX - threshold) * channels;
         } else {
-                mcpdm->up_channels = link_mask << 0;
-                dma_data->packet_size = mcpdm->up_threshold * channels;
+                /* If playback is not running assume a stereo stream to come */
+                if (!mcpdm->config[!stream].link_mask)
+                        mcpdm->config[!stream].link_mask = (0x3 << 3);
+
+                dma_data->maxburst = threshold * channels;
         }
 
+        /* Check if we need to restart McPDM with this stream */
+        if (mcpdm->config[stream].link_mask &&
+            mcpdm->config[stream].link_mask != link_mask)
+                mcpdm->restart = true;
+
+        mcpdm->config[stream].link_mask = link_mask;
+
         return 0;
 }
 
@@ -346,6 +365,11 @@ static int omap_mcpdm_prepare(struct snd_pcm_substream *substream,
         if (!omap_mcpdm_active(mcpdm)) {
                 omap_mcpdm_start(mcpdm);
                 omap_mcpdm_reg_dump(mcpdm);
+        } else if (mcpdm->restart) {
+                omap_mcpdm_stop(mcpdm);
+                omap_mcpdm_start(mcpdm);
+                mcpdm->restart = false;
+                omap_mcpdm_reg_dump(mcpdm);
         }
 
         return 0;
@@ -369,7 +393,7 @@ static int omap_mcpdm_probe(struct snd_soc_dai *dai)
         pm_runtime_get_sync(mcpdm->dev);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, 0x00);
 
-        ret = request_irq(mcpdm->irq, omap_mcpdm_irq_handler,
+        ret = devm_request_irq(mcpdm->dev, mcpdm->irq, omap_mcpdm_irq_handler,
                                 0, "McPDM", (void *)mcpdm);
 
         pm_runtime_put_sync(mcpdm->dev);
@@ -380,8 +404,9 @@ static int omap_mcpdm_probe(struct snd_soc_dai *dai)
         }
 
         /* Configure McPDM threshold values */
-        mcpdm->dn_threshold = 2;
-        mcpdm->up_threshold = MCPDM_UP_THRES_MAX - 3;
+        mcpdm->config[SNDRV_PCM_STREAM_PLAYBACK].threshold = 2;
+        mcpdm->config[SNDRV_PCM_STREAM_CAPTURE].threshold =
+                                                        MCPDM_UP_THRES_MAX - 3;
         return ret;
 }
 
@@ -389,7 +414,6 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai)
 {
         struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);
 
-        free_irq(mcpdm->irq, (void *)mcpdm);
         pm_runtime_disable(mcpdm->dev);
 
         return 0;
@@ -450,33 +474,30 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
         if (res == NULL)
                 return -ENOMEM;
 
-        omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA;
-        omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA;
+        mcpdm->dma_data[0].addr = res->start + MCPDM_REG_DN_DATA;
+        mcpdm->dma_data[1].addr = res->start + MCPDM_REG_UP_DATA;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");
         if (!res)
                 return -ENODEV;
 
-        omap_mcpdm_dai_dma_params[0].dma_req = res->start;
+        mcpdm->dma_req[0] = res->start;
+        mcpdm->dma_data[0].filter_data = &mcpdm->dma_req[0];
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "up_link");
         if (!res)
                 return -ENODEV;
 
-        omap_mcpdm_dai_dma_params[1].dma_req = res->start;
+        mcpdm->dma_req[1] = res->start;
+        mcpdm->dma_data[1].filter_data = &mcpdm->dma_req[1];
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
         if (res == NULL)
                 return -ENOMEM;
 
-        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     resource_size(res), "McPDM"))
-                return -EBUSY;
-
-        mcpdm->io_base = devm_ioremap(&pdev->dev, res->start,
-                                      resource_size(res));
-        if (!mcpdm->io_base)
-                return -ENOMEM;
+        mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(mcpdm->io_base))
+                return PTR_ERR(mcpdm->io_base);
 
         mcpdm->irq = platform_get_irq(pdev, 0);
         if (mcpdm->irq < 0)
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index c722c2ef9665..c8e272f9c2de 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -32,8 +32,6 @@
 #include <sound/dmaengine_pcm.h>
 #include <sound/soc.h>
 
-#include "omap-pcm.h"
-
 #ifdef CONFIG_ARCH_OMAP1
 #define pcm_omap1510()  cpu_is_omap1510()
 #else
@@ -56,25 +54,6 @@ static const struct snd_pcm_hardware omap_pcm_hardware = {
         .buffer_bytes_max       = 128 * 1024,
 };
 
-static int omap_pcm_get_dma_buswidth(int num_bits)
-{
-        int buswidth;
-
-        switch (num_bits) {
-        case 16:
-                buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;
-                break;
-        case 32:
-                buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;
-                break;
-        default:
-                buswidth = -EINVAL;
-                break;
-        }
-        return buswidth;
-}
-
-
 /* this may get called several times by oss emulation */
 static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *params)
@@ -105,20 +84,9 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
         if (err)
                 return err;
 
-        /* Override the *_dma addr_width if requested by the DAI driver */
-        if (dma_data->data_type) {
-                int buswidth = omap_pcm_get_dma_buswidth(dma_data->data_type);
-
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        config.dst_addr_width = buswidth;
-                else
-                        config.src_addr_width = buswidth;
-        }
-
-        config.src_addr = dma_data->port_addr;
-        config.dst_addr = dma_data->port_addr;
-        config.src_maxburst = dma_data->packet_size;
-        config.dst_maxburst = dma_data->packet_size;
+        snd_dmaengine_pcm_set_config_from_dai_data(substream,
+                        snd_soc_dai_get_dma_data(rtd->cpu_dai, substream),
+                        &config);
 
         return dmaengine_slave_config(chan, &config);
 }
@@ -129,37 +97,6 @@ static int omap_pcm_hw_free(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct omap_pcm_dma_data *dma_data;
-        int ret = 0;
-
-        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_RESUME:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                /* Configure McBSP internal buffer usage */
-                if (dma_data->set_threshold)
-                        dma_data->set_threshold(substream);
-                break;
-
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                break;
-        default:
-                ret = -EINVAL;
-        }
-
-        if (ret == 0)
-                ret = snd_dmaengine_pcm_trigger(substream, cmd);
-
-        return ret;
-}
-
 static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
 {
         snd_pcm_uframes_t offset;
@@ -175,20 +112,14 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
 static int omap_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
 
         snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware);
 
         dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
         return snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,
-                                      &dma_data->dma_req);
-}
-
-static int omap_pcm_close(struct snd_pcm_substream *substream)
-{
-        snd_dmaengine_pcm_close(substream);
-        return 0;
+                                      dma_data->filter_data);
 }
 
 static int omap_pcm_mmap(struct snd_pcm_substream *substream,
@@ -204,11 +135,11 @@ static int omap_pcm_mmap(struct snd_pcm_substream *substream,
 
 static struct snd_pcm_ops omap_pcm_ops = {
         .open           = omap_pcm_open,
-        .close          = omap_pcm_close,
+        .close          = snd_dmaengine_pcm_close,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = omap_pcm_hw_params,
         .hw_free        = omap_pcm_hw_free,
-        .trigger        = omap_pcm_trigger,
+        .trigger        = snd_dmaengine_pcm_trigger,
         .pointer        = omap_pcm_pointer,
         .mmap           = omap_pcm_mmap,
 };
diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h
deleted file mode 100644
index cabe74c4068b..000000000000
--- a/sound/soc/omap/omap-pcm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * omap-pcm.h
- *
- * Copyright (C) 2008 Nokia Corporation
- *
- * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
- *          Peter Ujfalusi <peter.ujfalusi@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef __OMAP_PCM_H__
-#define __OMAP_PCM_H__
-
-struct snd_pcm_substream;
-
-struct omap_pcm_dma_data {
-        char            *name;          /* stream identifier */
-        int             dma_req;        /* DMA request line */
-        unsigned long   port_addr;      /* transmit/receive register */
-        void (*set_threshold)(struct snd_pcm_substream *substream);
-        int             data_type;      /* 8, 16, 32 (bits) or 0 to let omap-pcm
-                                         * to decide the sDMA data type */
-        int             packet_size;    /* packet size only in PACKET mode */
-};
-
-#endif
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index fd98509d0f49..2a9324f794d8 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -43,7 +43,6 @@
 #include <sound/jack.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 struct omap_twl4030 {
         int jack_detect;        /* board can detect jack events */
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 805512f2555a..cf604a2faa18 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -34,7 +34,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define OMAP3_PANDORA_DAC_POWER_GPIO    118
 #define OMAP3_PANDORA_AMP_POWER_GPIO    14
@@ -80,12 +79,18 @@ static int omap3pandora_hw_params(struct snd_pcm_substream *substream,
 static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *k, int event)
 {
+        int ret;
+
         /*
          * The PCM1773 DAC datasheet requires 1ms delay between switching
          * VCC power on/off and /PD pin high/low
          */
         if (SND_SOC_DAPM_EVENT_ON(event)) {
-                regulator_enable(omap3pandora_dac_reg);
+                ret = regulator_enable(omap3pandora_dac_reg);
+                if (ret) {
+                        dev_err(w->dapm->dev, "Failed to power DAC: %d\n", ret);
+                        return ret;
+                }
                 mdelay(1);
                 gpio_set_value(OMAP3_PANDORA_DAC_POWER_GPIO, 1);
         } else {
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 06ef8d67ed1c..d03e57da7708 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -33,7 +33,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 #include "../codecs/tlv320aic23.h"
 
 #define CODEC_CLOCK     12000000
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 3cd525748975..249cd230ad8f 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -37,7 +37,6 @@
 #include <asm/mach-types.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define RX51_TVOUT_SEL_GPIO             40
 #define RX51_JACK_DETECT_GPIO           177