Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.10

A few more fixes, nothing too major though the DMA changes fix modular
builds.

10 files changed, 64 insertions, 166 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 5bce9152b64e..23e3c46cd0a4 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3235,18 +3235,10 @@ EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mmap);
 int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream,
                            struct vm_area_struct *area)
 {
-        long size;
-        unsigned long offset;
+        struct snd_pcm_runtime *runtime = substream->runtime;;
 
         area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
-        area->vm_flags |= VM_IO;
-        size = area->vm_end - area->vm_start;
-        offset = area->vm_pgoff << PAGE_SHIFT;
-        if (io_remap_pfn_range(area, area->vm_start,
-                                (substream->runtime->dma_addr + offset) >> PAGE_SHIFT,
-                                size, area->vm_page_prot))
-                return -EAGAIN;
-        return 0;
+        return vm_iomap_memory(area, runtime->dma_addr, runtime->dma_bytes);
 }
 
 EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem);
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index aeb3a6627d6a..8b85049daab0 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -636,11 +636,12 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
          * callback, take it into account here. That allows us to for example
          * send 32 bits per channel to the codec, while only 16 of them carry
          * audio payload.
-         * The clock ratio is given for a full period of data (both left and
-         * right channels), so it has to be divided by 2.
+         * The clock ratio is given for a full period of data (for I2S format
+         * both left and right channels), so it has to be divided by number of
+         * tdm-slots (for I2S - divided by 2).
          */
         if (dev->bclk_lrclk_ratio)
-                word_length = dev->bclk_lrclk_ratio / 2;
+                word_length = dev->bclk_lrclk_ratio / dev->tdm_slots;
 
         /* mapping of the XSSZ bit-field as described in the datasheet */
         fmt = (word_length >> 1) - 1;
@@ -834,17 +835,20 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
         int word_length;
         u8 fifo_level;
         u8 slots = dev->tdm_slots;
+        u8 active_serializers;
         int channels;
         struct snd_interval *pcm_channels = hw_param_interval(params,
                                         SNDRV_PCM_HW_PARAM_CHANNELS);
         channels = pcm_channels->min;
 
+        active_serializers = (channels + slots - 1) / slots;
+
         if (davinci_hw_common_param(dev, substream->stream, channels) == -EINVAL)
                 return -EINVAL;
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                fifo_level = dev->txnumevt;
+                fifo_level = dev->txnumevt * active_serializers;
         else
-                fifo_level = dev->rxnumevt;
+                fifo_level = dev->rxnumevt * active_serializers;
 
         if (dev->op_mode == DAVINCI_MCASP_DIT_MODE)
                 davinci_hw_dit_param(dev);
@@ -889,7 +893,6 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
                 dma_params->acnt = dma_params->data_type;
 
         dma_params->fifo_level = fifo_level;
-        dma_params->active_serializers = (channels + slots - 1) / slots;
         davinci_config_channel_size(dev, word_length);
 
         return 0;
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 0edd3b5a37fd..a9ac0c11da71 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -38,7 +38,7 @@ struct davinci_audio_dev {
         u8      num_serializer;
         u8      *serial_dir;
         u8      version;
-        u8      bclk_lrclk_ratio;
+        u16     bclk_lrclk_ratio;
 
         /* McASP FIFO related */
         u8      txnumevt;
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 078031d61167..b2f27c2e5fdc 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -181,7 +181,6 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
         unsigned short acnt;
         unsigned int count;
         unsigned int fifo_level;
-        unsigned char serializers = prtd->params->active_serializers;
 
         period_size = snd_pcm_lib_period_bytes(substream);
         dma_offset = prtd->period * period_size;
@@ -195,14 +194,14 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
         data_type = prtd->params->data_type;
         count = period_size / data_type;
         if (fifo_level)
-                count /= fifo_level * serializers;
+                count /= fifo_level;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 src = dma_pos;
                 dst = prtd->params->dma_addr;
                 src_bidx = data_type;
                 dst_bidx = 4;
-                src_cidx = data_type * fifo_level * serializers;
+                src_cidx = data_type * fifo_level;
                 dst_cidx = 0;
         } else {
                 src = prtd->params->dma_addr;
@@ -210,7 +209,7 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
                 src_bidx = 0;
                 dst_bidx = data_type;
                 src_cidx = 0;
-                dst_cidx = data_type * fifo_level * serializers;
+                dst_cidx = data_type * fifo_level;
         }
 
         acnt = prtd->params->acnt;
@@ -225,8 +224,8 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
                                                         ASYNC);
         else
                 edma_set_transfer_params(prtd->asp_link[0], acnt,
-                                                fifo_level * serializers,
-                                                count, fifo_level * serializers,
+                                                fifo_level,
+                                                count, fifo_level,
                                                 ABSYNC);
 }
 
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index 32d7634d7b26..b6ef7039dd09 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -27,7 +27,6 @@ struct davinci_pcm_dma_params {
         unsigned char data_type;        /* xfer data type */
         unsigned char convert_mono_stereo;
         unsigned int fifo_level;
-        unsigned char active_serializers; /* num. of active audio serializers */
 };
 
 int davinci_soc_platform_register(struct device *dev);
diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
index b6fa77678d97..78d321cbe8b4 100644
--- a/sound/soc/mxs/Kconfig
+++ b/sound/soc/mxs/Kconfig
@@ -1,7 +1,7 @@
 menuconfig SND_MXS_SOC
         tristate "SoC Audio for Freescale MXS CPUs"
         depends on ARCH_MXS
-        select SND_SOC_DMAENGINE_PCM
+        select SND_SOC_GENERIC_DMAENGINE_PCM
         help
           Say Y or M if you want to add support for codecs attached to
           the MXS SAIF interface.
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
index 7bceb16d0fd9..b41fffc056fb 100644
--- a/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@ -18,32 +18,24 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <linux/clk.h>
-#include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/dma-mapping.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/dmaengine.h>
 
 #include <sound/core.h>
-#include <sound/initval.h>
 #include <sound/pcm.h>
-#include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
 #include "mxs-pcm.h"
 
-static struct snd_pcm_hardware snd_mxs_hardware = {
+static const struct snd_pcm_hardware snd_mxs_hardware = {
         .info                   = SNDRV_PCM_INFO_MMAP |
                                   SNDRV_PCM_INFO_MMAP_VALID |
                                   SNDRV_PCM_INFO_PAUSE |
                                   SNDRV_PCM_INFO_RESUME |
-                                  SNDRV_PCM_INFO_INTERLEAVED,
+                                  SNDRV_PCM_INFO_INTERLEAVED |
+                                  SNDRV_PCM_INFO_HALF_DUPLEX,
         .formats                = SNDRV_PCM_FMTBIT_S16_LE |
                                   SNDRV_PCM_FMTBIT_S20_3LE |
                                   SNDRV_PCM_FMTBIT_S24_LE,
@@ -55,7 +47,6 @@ static struct snd_pcm_hardware snd_mxs_hardware = {
         .periods_max            = 52,
         .buffer_bytes_max       = 64 * 1024,
         .fifo_size              = 32,
-
 };
 
 static bool filter(struct dma_chan *chan, void *param)
@@ -73,129 +64,25 @@ static bool filter(struct dma_chan *chan, void *param)
         return true;
 }
 
-static int snd_mxs_pcm_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *params)
-{
-        snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
-
-        return 0;
-}
-
-static int snd_mxs_open(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-
-        snd_soc_set_runtime_hwparams(substream, &snd_mxs_hardware);
-
-        return snd_dmaengine_pcm_open_request_chan(substream, filter,
-                snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
-}
-
-static int snd_mxs_pcm_mmap(struct snd_pcm_substream *substream,
-                struct vm_area_struct *vma)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-
-        return dma_mmap_writecombine(substream->pcm->card->dev, vma,
-                                        runtime->dma_area,
-                                        runtime->dma_addr,
-                                        runtime->dma_bytes);
-}
-
-static struct snd_pcm_ops mxs_pcm_ops = {
-        .open           = snd_mxs_open,
-        .close          = snd_dmaengine_pcm_close_release_chan,
-        .ioctl          = snd_pcm_lib_ioctl,
-        .hw_params      = snd_mxs_pcm_hw_params,
-        .trigger        = snd_dmaengine_pcm_trigger,
-        .pointer        = snd_dmaengine_pcm_pointer_no_residue,
-        .mmap           = snd_mxs_pcm_mmap,
-};
-
-static int mxs_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
-{
-        struct snd_pcm_substream *substream = pcm->streams[stream].substream;
-        struct snd_dma_buffer *buf = &substream->dma_buffer;
-        size_t size = snd_mxs_hardware.buffer_bytes_max;
-
-        buf->dev.type = SNDRV_DMA_TYPE_DEV;
-        buf->dev.dev = pcm->card->dev;
-        buf->private_data = NULL;
-        buf->area = dma_alloc_writecombine(pcm->card->dev, size,
-                                           &buf->addr, GFP_KERNEL);
-        if (!buf->area)
-                return -ENOMEM;
-        buf->bytes = size;
-
-        return 0;
-}
-
-static u64 mxs_pcm_dmamask = DMA_BIT_MASK(32);
-static int mxs_pcm_new(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_card *card = rtd->card->snd_card;
-        struct snd_pcm *pcm = rtd->pcm;
-        int ret = 0;
-
-        if (!card->dev->dma_mask)
-                card->dev->dma_mask = &mxs_pcm_dmamask;
-        if (!card->dev->coherent_dma_mask)
-                card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
-
-        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
-                ret = mxs_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_PLAYBACK);
-                if (ret)
-                        goto out;
-        }
-
-        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
-                ret = mxs_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_CAPTURE);
-                if (ret)
-                        goto out;
-        }
-
-out:
-        return ret;
-}
-
-static void mxs_pcm_free(struct snd_pcm *pcm)
-{
-        struct snd_pcm_substream *substream;
-        struct snd_dma_buffer *buf;
-        int stream;
-
-        for (stream = 0; stream < 2; stream++) {
-                substream = pcm->streams[stream].substream;
-                if (!substream)
-                        continue;
-
-                buf = &substream->dma_buffer;
-                if (!buf->area)
-                        continue;
-
-                dma_free_writecombine(pcm->card->dev, buf->bytes,
-                                      buf->area, buf->addr);
-                buf->area = NULL;
-        }
-}
-
-static struct snd_soc_platform_driver mxs_soc_platform = {
-        .ops            = &mxs_pcm_ops,
-        .pcm_new        = mxs_pcm_new,
-        .pcm_free       = mxs_pcm_free,
+static const struct snd_dmaengine_pcm_config mxs_dmaengine_pcm_config = {
+        .pcm_hardware = &snd_mxs_hardware,
+        .compat_filter_fn = filter,
+        .prealloc_buffer_size = 64 * 1024,
 };
 
 int mxs_pcm_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(dev, &mxs_soc_platform);
+        return snd_dmaengine_pcm_register(dev, &mxs_dmaengine_pcm_config,
+                SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
+                SND_DMAENGINE_PCM_FLAG_NO_DT |
+                SND_DMAENGINE_PCM_FLAG_COMPAT |
+                SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX);
 }
 EXPORT_SYMBOL_GPL(mxs_pcm_platform_register);
 
 void mxs_pcm_platform_unregister(struct device *dev)
 {
-        snd_soc_unregister_platform(dev);
+        snd_dmaengine_pcm_unregister(dev);
 }
 EXPORT_SYMBOL_GPL(mxs_pcm_platform_unregister);
 
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index abf4ddf4ed89..b563141a6543 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -369,7 +369,6 @@ static int mxs_saif_startup(struct snd_pcm_substream *substream,
                            struct snd_soc_dai *cpu_dai)
 {
         struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai);
-        snd_soc_dai_set_dma_data(cpu_dai, substream, &saif->dma_param);
 
         /* clear error status to 0 for each re-open */
         saif->fifo_underrun = 0;
@@ -605,6 +604,8 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai)
         struct mxs_saif *saif = dev_get_drvdata(dai->dev);
 
         snd_soc_dai_set_drvdata(dai, saif);
+        dai->playback_dma_data = &saif->dma_param;
+        dai->capture_dma_data = &saif->dma_param;
 
         return 0;
 }
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index ae0c37e66ae0..e29ec3cd84b1 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -21,7 +21,6 @@
 #include <sound/soc.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
-#include <linux/of_dma.h>
 
 #include <sound/dmaengine_pcm.h>
 
@@ -29,7 +28,7 @@ struct dmaengine_pcm {
         struct dma_chan *chan[SNDRV_PCM_STREAM_CAPTURE + 1];
         const struct snd_dmaengine_pcm_config *config;
         struct snd_soc_platform platform;
-        bool compat;
+        unsigned int flags;
 };
 
 static struct dmaengine_pcm *soc_platform_to_pcm(struct snd_soc_platform *p)
@@ -128,6 +127,9 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
 {
         struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
 
+        if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
+                return pcm->chan[0];
+
         if (pcm->config->compat_request_channel)
                 return pcm->config->compat_request_channel(rtd, substream);
 
@@ -148,7 +150,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
                 if (!substream)
                         continue;
 
-                if (!pcm->chan[i] && pcm->compat) {
+                if (!pcm->chan[i] && (pcm->flags & SND_DMAENGINE_PCM_FLAG_COMPAT)) {
                         pcm->chan[i] = dmaengine_pcm_compat_request_channel(rtd,
                                 substream);
                 }
@@ -215,6 +217,25 @@ static const char * const dmaengine_pcm_dma_channel_names[] = {
         [SNDRV_PCM_STREAM_CAPTURE] = "rx",
 };
 
+static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
+        struct device *dev)
+{
+        unsigned int i;
+
+        if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !dev->of_node)
+                return;
+
+        if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
+                pcm->chan[0] = dma_request_slave_channel(dev, "rx-tx");
+                pcm->chan[1] = pcm->chan[0];
+        } else {
+                for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
+                        pcm->chan[i] = dma_request_slave_channel(dev,
+                                        dmaengine_pcm_dma_channel_names[i]);
+                }
+        }
+}
+
 /**
  * snd_dmaengine_pcm_register - Register a dmaengine based PCM device
  * @dev: The parent device for the PCM device
@@ -225,23 +246,15 @@ int snd_dmaengine_pcm_register(struct device *dev,
         const struct snd_dmaengine_pcm_config *config, unsigned int flags)
 {
         struct dmaengine_pcm *pcm;
-        unsigned int i;
 
         pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);
         if (!pcm)
                 return -ENOMEM;
 
         pcm->config = config;
+        pcm->flags = flags;
 
-        if (flags & SND_DMAENGINE_PCM_FLAG_COMPAT)
-                pcm->compat = true;
-
-        if (!(flags & SND_DMAENGINE_PCM_FLAG_NO_DT) && dev->of_node) {
-                for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
-                        pcm->chan[i] = of_dma_request_slave_channel(dev->of_node,
-                                        dmaengine_pcm_dma_channel_names[i]);
-                }
-        }
+        dmaengine_pcm_request_chan_of(pcm, dev);
 
         if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)
                 return snd_soc_add_platform(dev, &pcm->platform,
@@ -272,8 +285,11 @@ void snd_dmaengine_pcm_unregister(struct device *dev)
         pcm = soc_platform_to_pcm(platform);
 
         for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
-                if (pcm->chan[i])
+                if (pcm->chan[i]) {
                         dma_release_channel(pcm->chan[i]);
+                        if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX)
+                                break;
+                }
         }
 
         snd_soc_remove_platform(platform);
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h
index 1311c0df7628..6f3e3dccbcb6 100644
--- a/sound/soc/ux500/ux500_msp_i2s.h
+++ b/sound/soc/ux500/ux500_msp_i2s.h
@@ -543,6 +543,7 @@ struct ux500_msp_dma_params {
         struct stedma40_chan_cfg *dma_cfg;
 };
 
+struct msp_i2s_platform_data;
 int ux500_msp_i2s_init_msp(struct platform_device *pdev,
                         struct ux500_msp **msp_p,
                         struct msp_i2s_platform_data *platform_data);