4 files changed, 19 insertions, 270 deletions

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index d1ccbdc8371b..f8c1cdd940ac 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -1,6 +1,7 @@
 config SND_PXA2XX_SOC
         tristate "SoC Audio for the Intel PXA2xx chip"
         depends on ARCH_PXA
+        select SND_PXA2XX_LIB
         help
           Say Y or M if you want to add support for codecs attached to
           the PXA2xx AC97, I2S or SSP interface. You will also need
@@ -14,7 +15,7 @@ config SND_PXA2XX_SOC_AC97
         tristate
         select AC97_BUS
         select SND_ARM
-        select SND_PXA2XX_LIB
+        select SND_PXA2XX_LIB_AC97
         select SND_SOC_AC97_BUS
 
 config SND_PXA2XX_SOC_I2S
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 21ca3fe22306..39d19212f6d3 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -21,6 +21,7 @@
 #include <sound/pcm.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
+#include <sound/pxa2xx-lib.h>
 
 #include <mach/hardware.h>
 #include <mach/pxa-regs.h>
@@ -30,6 +31,15 @@
 #include "pxa2xx-pcm.h"
 #include "pxa2xx-i2s.h"
 
+struct pxa2xx_gpio {
+        u32 sys;
+        u32     rx;
+        u32 tx;
+        u32 clk;
+        u32 frm;
+};
+
+
 struct pxa_i2s_port {
         u32 sadiv;
         u32 sacr0;
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index 771c592b0429..afcd892cd2fa 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -10,64 +10,14 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
 #include <linux/dma-mapping.h>
 
 #include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
 #include <sound/soc.h>
-
-#include <asm/dma.h>
-#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
-#include <mach/audio.h>
+#include <sound/pxa2xx-lib.h>
 
 #include "pxa2xx-pcm.h"
-
-static const struct snd_pcm_hardware pxa2xx_pcm_hardware = {
-        .info                   = SNDRV_PCM_INFO_MMAP |
-                                  SNDRV_PCM_INFO_MMAP_VALID |
-                                  SNDRV_PCM_INFO_INTERLEAVED |
-                                  SNDRV_PCM_INFO_PAUSE |
-                                  SNDRV_PCM_INFO_RESUME,
-        .formats                = SNDRV_PCM_FMTBIT_S16_LE |
-                                        SNDRV_PCM_FMTBIT_S24_LE |
-                                        SNDRV_PCM_FMTBIT_S32_LE,
-        .period_bytes_min       = 32,
-        .period_bytes_max       = 8192 - 32,
-        .periods_min            = 1,
-        .periods_max            = PAGE_SIZE/sizeof(pxa_dma_desc),
-        .buffer_bytes_max       = 128 * 1024,
-        .fifo_size              = 32,
-};
-
-struct pxa2xx_runtime_data {
-        int dma_ch;
-        struct pxa2xx_pcm_dma_params *params;
-        pxa_dma_desc *dma_desc_array;
-        dma_addr_t dma_desc_array_phys;
-};
-
-static void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id)
-{
-        struct snd_pcm_substream *substream = dev_id;
-        struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
-        int dcsr;
-
-        dcsr = DCSR(dma_ch);
-        DCSR(dma_ch) = dcsr & ~DCSR_STOPIRQEN;
-
-        if (dcsr & DCSR_ENDINTR) {
-                snd_pcm_period_elapsed(substream);
-        } else {
-                printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n",
-                        prtd->params->name, dma_ch, dcsr);
-        }
-}
+#include "../../arm/pxa2xx-pcm.h"
 
 static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
@@ -76,10 +26,6 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
         struct pxa2xx_runtime_data *prtd = runtime->private_data;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct pxa2xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data;
-        size_t totsize = params_buffer_bytes(params);
-        size_t period = params_period_bytes(params);
-        pxa_dma_desc *dma_desc;
-        dma_addr_t dma_buff_phys, next_desc_phys;
         int ret;
 
         /* return if this is a bufferless transfer e.g.
@@ -106,42 +52,16 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
                 prtd->dma_ch = ret;
         }
 
-        snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
-        runtime->dma_bytes = totsize;
-
-        dma_desc = prtd->dma_desc_array;
-        next_desc_phys = prtd->dma_desc_array_phys;
-        dma_buff_phys = runtime->dma_addr;
-        do {
-                next_desc_phys += sizeof(pxa_dma_desc);
-                dma_desc->ddadr = next_desc_phys;
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                        dma_desc->dsadr = dma_buff_phys;
-                        dma_desc->dtadr = prtd->params->dev_addr;
-                } else {
-                        dma_desc->dsadr = prtd->params->dev_addr;
-                        dma_desc->dtadr = dma_buff_phys;
-                }
-                if (period > totsize)
-                        period = totsize;
-                dma_desc->dcmd = prtd->params->dcmd | period | DCMD_ENDIRQEN;
-                dma_desc++;
-                dma_buff_phys += period;
-        } while (totsize -= period);
-        dma_desc[-1].ddadr = prtd->dma_desc_array_phys;
-
-        return 0;
+        return __pxa2xx_pcm_hw_params(substream, params);
 }
 
 static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
 {
         struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
 
-        if (prtd && prtd->params)
-                *prtd->params->drcmr = 0;
+        __pxa2xx_pcm_hw_free(substream);
 
         if (prtd->dma_ch) {
-                snd_pcm_set_runtime_buffer(substream, NULL);
                 pxa_free_dma(prtd->dma_ch);
                 prtd->dma_ch = 0;
         }
@@ -149,185 +69,18 @@ static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)
-{
-        struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
-
-        DCSR(prtd->dma_ch) &= ~DCSR_RUN;
-        DCSR(prtd->dma_ch) = 0;
-        DCMD(prtd->dma_ch) = 0;
-        *prtd->params->drcmr = prtd->dma_ch | DRCMR_MAPVLD;
-
-        return 0;
-}
-
-static int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-        struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
-        int ret = 0;
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-                DDADR(prtd->dma_ch) = prtd->dma_desc_array_phys;
-                DCSR(prtd->dma_ch) = DCSR_RUN;
-                break;
-
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                DCSR(prtd->dma_ch) &= ~DCSR_RUN;
-                break;
-
-        case SNDRV_PCM_TRIGGER_RESUME:
-                DCSR(prtd->dma_ch) |= DCSR_RUN;
-                break;
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                DDADR(prtd->dma_ch) = prtd->dma_desc_array_phys;
-                DCSR(prtd->dma_ch) |= DCSR_RUN;
-                break;
-
-        default:
-                ret = -EINVAL;
-        }
-
-        return ret;
-}
-
-static snd_pcm_uframes_t
-pxa2xx_pcm_pointer(struct snd_pcm_substream *substream)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct pxa2xx_runtime_data *prtd = runtime->private_data;
-
-        dma_addr_t ptr = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-                         DSADR(prtd->dma_ch) : DTADR(prtd->dma_ch);
-        snd_pcm_uframes_t x = bytes_to_frames(runtime, ptr - runtime->dma_addr);
-
-        if (x == runtime->buffer_size)
-                x = 0;
-        return x;
-}
-
-static int pxa2xx_pcm_open(struct snd_pcm_substream *substream)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct pxa2xx_runtime_data *prtd;
-        int ret;
-
-        snd_soc_set_runtime_hwparams(substream, &pxa2xx_pcm_hardware);
-
-        /*
-         * For mysterious reasons (and despite what the manual says)
-         * playback samples are lost if the DMA count is not a multiple
-         * of the DMA burst size.  Let's add a rule to enforce that.
-         */
-        ret = snd_pcm_hw_constraint_step(runtime, 0,
-                SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 32);
-        if (ret)
-                goto out;
-
-        ret = snd_pcm_hw_constraint_step(runtime, 0,
-                SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 32);
-        if (ret)
-                goto out;
-
-        ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
-        if (ret < 0)
-                goto out;
-
-        prtd = kzalloc(sizeof(struct pxa2xx_runtime_data), GFP_KERNEL);
-        if (prtd == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        prtd->dma_desc_array =
-                dma_alloc_writecombine(substream->pcm->card->dev, PAGE_SIZE,
-                                       &prtd->dma_desc_array_phys, GFP_KERNEL);
-        if (!prtd->dma_desc_array) {
-                ret = -ENOMEM;
-                goto err1;
-        }
-
-        runtime->private_data = prtd;
-        return 0;
-
- err1:
-        kfree(prtd);
- out:
-        return ret;
-}
-
-static int pxa2xx_pcm_close(struct snd_pcm_substream *substream)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct pxa2xx_runtime_data *prtd = runtime->private_data;
-
-        dma_free_writecombine(substream->pcm->card->dev, PAGE_SIZE,
-                              prtd->dma_desc_array, prtd->dma_desc_array_phys);
-        kfree(prtd);
-        return 0;
-}
-
-static int pxa2xx_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);
-}
-
 struct snd_pcm_ops pxa2xx_pcm_ops = {
-        .open           = pxa2xx_pcm_open,
-        .close          = pxa2xx_pcm_close,
+        .open           = __pxa2xx_pcm_open,
+        .close          = __pxa2xx_pcm_close,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = pxa2xx_pcm_hw_params,
         .hw_free        = pxa2xx_pcm_hw_free,
-        .prepare        = pxa2xx_pcm_prepare,
+        .prepare        = __pxa2xx_pcm_prepare,
         .trigger        = pxa2xx_pcm_trigger,
         .pointer        = pxa2xx_pcm_pointer,
         .mmap           = pxa2xx_pcm_mmap,
 };
 
-static int pxa2xx_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 = pxa2xx_pcm_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 void pxa2xx_pcm_free_dma_buffers(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 u64 pxa2xx_pcm_dmamask = DMA_32BIT_MASK;
 
 static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
diff --git a/sound/soc/pxa/pxa2xx-pcm.h b/sound/soc/pxa/pxa2xx-pcm.h
index 54c9c755e508..60c3b20aeeb4 100644
--- a/sound/soc/pxa/pxa2xx-pcm.h
+++ b/sound/soc/pxa/pxa2xx-pcm.h
@@ -13,21 +13,6 @@
 #ifndef _PXA2XX_PCM_H
 #define _PXA2XX_PCM_H
 
-struct pxa2xx_pcm_dma_params {
-        char *name;                     /* stream identifier */
-        u32 dcmd;                       /* DMA descriptor dcmd field */
-        volatile u32 *drcmr;            /* the DMA request channel to use */
-        u32 dev_addr;                   /* device physical address for DMA */
-};
-
-struct pxa2xx_gpio {
-        u32 sys;
-        u32     rx;
-        u32 tx;
-        u32 clk;
-        u32 frm;
-};
-
 /* platform data */
 extern struct snd_soc_platform pxa2xx_soc_platform;