ASoC: Ux500: Add platform-driver
authorOla Lilja <ola.o.lilja@stericsson.com>
Thu, 24 May 2012 13:26:32 +0000 (15:26 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 3 Jun 2012 12:06:38 +0000 (13:06 +0100)
Add platform-driver handling all DMA-activities.

Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/ux500/Kconfig
sound/soc/ux500/Makefile
sound/soc/ux500/ux500_pcm.c [new file with mode: 0644]
sound/soc/ux500/ux500_pcm.h [new file with mode: 0644]

index 44cf434..1d38515 100644 (file)
@@ -12,3 +12,10 @@ menuconfig SND_SOC_UX500
 config SND_SOC_UX500_PLAT_MSP_I2S
        tristate
        depends on SND_SOC_UX500
+
+config SND_SOC_UX500_PLAT_DMA
+       tristate "Platform - DB8500 (DMA)"
+       depends on SND_SOC_UX500
+       select SND_SOC_DMAENGINE_PCM
+       help
+               Say Y if you want to enable the Ux500 platform-driver.
index 19974c5..4634bf0 100644 (file)
@@ -2,3 +2,6 @@
 
 snd-soc-ux500-plat-msp-i2s-objs := ux500_msp_dai.o ux500_msp_i2s.o
 obj-$(CONFIG_SND_SOC_UX500_PLAT_MSP_I2S) += snd-soc-ux500-plat-msp-i2s.o
+
+snd-soc-ux500-plat-dma-objs := ux500_pcm.o
+obj-$(CONFIG_SND_SOC_UX500_PLAT_DMA) += snd-soc-ux500-plat-dma.o
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
new file mode 100644 (file)
index 0000000..66b080e
--- /dev/null
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2012
+ *
+ * Author: Ola Lilja <ola.o.lilja@stericsson.com>,
+ *         Roger Nilsson <roger.xr.nilsson@stericsson.com>
+ *         for ST-Ericsson.
+ *
+ * License terms:
+ *
+ * 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.
+ */
+
+#include <asm/page.h>
+
+#include <linux/module.h>
+#include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
+#include <linux/slab.h>
+
+#include <plat/ste_dma40.h>
+
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
+
+#include "ux500_msp_i2s.h"
+#include "ux500_pcm.h"
+
+static struct snd_pcm_hardware ux500_pcm_hw_playback = {
+       .info = SNDRV_PCM_INFO_INTERLEAVED |
+               SNDRV_PCM_INFO_MMAP |
+               SNDRV_PCM_INFO_RESUME |
+               SNDRV_PCM_INFO_PAUSE,
+       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+               SNDRV_PCM_FMTBIT_U16_LE |
+               SNDRV_PCM_FMTBIT_S16_BE |
+               SNDRV_PCM_FMTBIT_U16_BE,
+       .rates = SNDRV_PCM_RATE_KNOT,
+       .rate_min = UX500_PLATFORM_MIN_RATE_PLAYBACK,
+       .rate_max = UX500_PLATFORM_MAX_RATE_PLAYBACK,
+       .channels_min = UX500_PLATFORM_MIN_CHANNELS,
+       .channels_max = UX500_PLATFORM_MAX_CHANNELS,
+       .buffer_bytes_max = UX500_PLATFORM_BUFFER_BYTES_MAX,
+       .period_bytes_min = UX500_PLATFORM_PERIODS_BYTES_MIN,
+       .period_bytes_max = UX500_PLATFORM_PERIODS_BYTES_MAX,
+       .periods_min = UX500_PLATFORM_PERIODS_MIN,
+       .periods_max = UX500_PLATFORM_PERIODS_MAX,
+};
+
+static struct snd_pcm_hardware ux500_pcm_hw_capture = {
+       .info = SNDRV_PCM_INFO_INTERLEAVED |
+               SNDRV_PCM_INFO_MMAP |
+               SNDRV_PCM_INFO_RESUME |
+               SNDRV_PCM_INFO_PAUSE,
+       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+               SNDRV_PCM_FMTBIT_U16_LE |
+               SNDRV_PCM_FMTBIT_S16_BE |
+               SNDRV_PCM_FMTBIT_U16_BE,
+       .rates = SNDRV_PCM_RATE_KNOT,
+       .rate_min = UX500_PLATFORM_MIN_RATE_CAPTURE,
+       .rate_max = UX500_PLATFORM_MAX_RATE_CAPTURE,
+       .channels_min = UX500_PLATFORM_MIN_CHANNELS,
+       .channels_max = UX500_PLATFORM_MAX_CHANNELS,
+       .buffer_bytes_max = UX500_PLATFORM_BUFFER_BYTES_MAX,
+       .period_bytes_min = UX500_PLATFORM_PERIODS_BYTES_MIN,
+       .period_bytes_max = UX500_PLATFORM_PERIODS_BYTES_MAX,
+       .periods_min = UX500_PLATFORM_PERIODS_MIN,
+       .periods_max = UX500_PLATFORM_PERIODS_MAX,
+};
+
+static void ux500_pcm_dma_hw_free(struct device *dev,
+                               struct snd_pcm_substream *substream)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       struct snd_dma_buffer *buf = runtime->dma_buffer_p;
+
+       if (runtime->dma_area == NULL)
+               return;
+
+       if (buf != &substream->dma_buffer) {
+               dma_free_coherent(buf->dev.dev, buf->bytes, buf->area,
+                               buf->addr);
+               kfree(runtime->dma_buffer_p);
+       }
+
+       snd_pcm_set_runtime_buffer(substream, NULL);
+}
+
+static int ux500_pcm_open(struct snd_pcm_substream *substream)
+{
+       int stream_id = substream->pstr->stream;
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *dai = rtd->cpu_dai;
+       struct device *dev = dai->dev;
+       int ret;
+       struct ux500_msp_dma_params *dma_params;
+       u16 per_data_width, mem_data_width;
+       struct stedma40_chan_cfg *dma_cfg;
+
+       dev_dbg(dev, "%s: MSP %d (%s): Enter.\n", __func__, dai->id,
+               snd_pcm_stream_str(substream));
+
+       dev_dbg(dev, "%s: Set runtime hwparams.\n", __func__);
+       if (stream_id == SNDRV_PCM_STREAM_PLAYBACK)
+               snd_soc_set_runtime_hwparams(substream,
+                                       &ux500_pcm_hw_playback);
+       else
+               snd_soc_set_runtime_hwparams(substream,
+                                       &ux500_pcm_hw_capture);
+
+       /* ensure that buffer size is a multiple of period size */
+       ret = snd_pcm_hw_constraint_integer(runtime,
+                                       SNDRV_PCM_HW_PARAM_PERIODS);
+       if (ret < 0) {
+               dev_err(dev, "%s: Error: snd_pcm_hw_constraints failed (%d)\n",
+                       __func__, ret);
+               return ret;
+       }
+
+       dev_dbg(dev, "%s: Set hw-struct for %s.\n", __func__,
+               snd_pcm_stream_str(substream));
+       runtime->hw = (stream_id == SNDRV_PCM_STREAM_PLAYBACK) ?
+               ux500_pcm_hw_playback : ux500_pcm_hw_capture;
+
+       mem_data_width = STEDMA40_HALFWORD_WIDTH;
+
+       dma_params = snd_soc_dai_get_dma_data(dai, substream);
+       switch (dma_params->data_size) {
+       case 32:
+               per_data_width = STEDMA40_WORD_WIDTH;
+               break;
+       case 16:
+               per_data_width = STEDMA40_HALFWORD_WIDTH;
+               break;
+       case 8:
+               per_data_width = STEDMA40_BYTE_WIDTH;
+               break;
+       default:
+               per_data_width = STEDMA40_WORD_WIDTH;
+               dev_warn(rtd->platform->dev,
+                       "%s: Unknown data-size (%d)! Assuming 32 bits.\n",
+                       __func__, dma_params->data_size);
+       }
+
+       dma_cfg = dma_params->dma_cfg;
+
+       if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+               dma_cfg->src_info.data_width = mem_data_width;
+               dma_cfg->dst_info.data_width = per_data_width;
+       } else {
+               dma_cfg->src_info.data_width = per_data_width;
+               dma_cfg->dst_info.data_width = mem_data_width;
+       }
+
+
+       ret = snd_dmaengine_pcm_open(substream, stedma40_filter, dma_cfg);
+       if (ret) {
+               dev_dbg(dai->dev,
+                       "%s: ERROR: snd_dmaengine_pcm_open failed (%d)!\n",
+                       __func__, ret);
+               return ret;
+       }
+
+       snd_dmaengine_pcm_set_data(substream, dma_cfg);
+
+       return 0;
+}
+
+static int ux500_pcm_close(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *dai = rtd->cpu_dai;
+
+       dev_dbg(dai->dev, "%s: Enter\n", __func__);
+
+       snd_dmaengine_pcm_close(substream);
+
+       return 0;
+}
+
+static int ux500_pcm_hw_params(struct snd_pcm_substream *substream,
+                       struct snd_pcm_hw_params *hw_params)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       struct snd_dma_buffer *buf = runtime->dma_buffer_p;
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       int ret = 0;
+       int size;
+
+       dev_dbg(rtd->platform->dev, "%s: Enter\n", __func__);
+
+       size = params_buffer_bytes(hw_params);
+
+       if (buf) {
+               if (buf->bytes >= size)
+                       goto out;
+               ux500_pcm_dma_hw_free(NULL, substream);
+       }
+
+       if (substream->dma_buffer.area != NULL &&
+               substream->dma_buffer.bytes >= size) {
+               buf = &substream->dma_buffer;
+       } else {
+               buf = kmalloc(sizeof(struct snd_dma_buffer), GFP_KERNEL);
+               if (!buf)
+                       goto nomem;
+
+               buf->dev.type = SNDRV_DMA_TYPE_DEV;
+               buf->dev.dev = NULL;
+               buf->area = dma_alloc_coherent(NULL, size, &buf->addr,
+                                       GFP_KERNEL);
+               buf->bytes = size;
+               buf->private_data = NULL;
+
+               if (!buf->area)
+                       goto free;
+       }
+       snd_pcm_set_runtime_buffer(substream, buf);
+       ret = 1;
+ out:
+       runtime->dma_bytes = size;
+       return ret;
+
+ free:
+       kfree(buf);
+ nomem:
+       return -ENOMEM;
+}
+
+static int ux500_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+
+       dev_dbg(rtd->platform->dev, "%s: Enter\n", __func__);
+
+       ux500_pcm_dma_hw_free(NULL, substream);
+
+       return 0;
+}
+
+static int ux500_pcm_mmap(struct snd_pcm_substream *substream,
+                       struct vm_area_struct *vma)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+
+       dev_dbg(rtd->platform->dev, "%s: Enter.\n", __func__);
+
+       return dma_mmap_coherent(NULL, vma, runtime->dma_area,
+                               runtime->dma_addr, runtime->dma_bytes);
+}
+
+static struct snd_pcm_ops ux500_pcm_ops = {
+       .open           = ux500_pcm_open,
+       .close          = ux500_pcm_close,
+       .ioctl          = snd_pcm_lib_ioctl,
+       .hw_params      = ux500_pcm_hw_params,
+       .hw_free        = ux500_pcm_hw_free,
+       .trigger        = snd_dmaengine_pcm_trigger,
+       .pointer        = snd_dmaengine_pcm_pointer,
+       .mmap           = ux500_pcm_mmap
+};
+
+int ux500_pcm_new(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_pcm *pcm = rtd->pcm;
+
+       dev_dbg(rtd->platform->dev, "%s: Enter (id = '%s').\n", __func__,
+               pcm->id);
+
+       pcm->info_flags = 0;
+
+       return 0;
+}
+
+static struct snd_soc_platform_driver ux500_pcm_soc_drv = {
+       .ops            = &ux500_pcm_ops,
+       .pcm_new        = ux500_pcm_new,
+};
+
+static int __devexit ux500_pcm_drv_probe(struct platform_device *pdev)
+{
+       int ret;
+
+       ret = snd_soc_register_platform(&pdev->dev, &ux500_pcm_soc_drv);
+       if (ret < 0) {
+               dev_err(&pdev->dev,
+                       "%s: ERROR: Failed to register platform '%s' (%d)!\n",
+                       __func__, pdev->name, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int __devinit ux500_pcm_drv_remove(struct platform_device *pdev)
+{
+       snd_soc_unregister_platform(&pdev->dev);
+
+       return 0;
+}
+
+static struct platform_driver ux500_pcm_driver = {
+       .driver = {
+               .name = "ux500-pcm",
+               .owner = THIS_MODULE,
+       },
+
+       .probe = ux500_pcm_drv_probe,
+       .remove = __devexit_p(ux500_pcm_drv_remove),
+};
+module_platform_driver(ux500_pcm_driver);
+
+MODULE_LICENSE("GPLv2");
diff --git a/sound/soc/ux500/ux500_pcm.h b/sound/soc/ux500/ux500_pcm.h
new file mode 100644 (file)
index 0000000..77ed44d
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2012
+ *
+ * Author: Ola Lilja <ola.o.lilja@stericsson.com>,
+ *         Roger Nilsson <roger.xr.nilsson@stericsson.com>
+ *         for ST-Ericsson.
+ *
+ * License terms:
+ *
+ * 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.
+ */
+#ifndef UX500_PCM_H
+#define UX500_PCM_H
+
+#include <asm/page.h>
+
+#include <linux/workqueue.h>
+
+#define UX500_PLATFORM_MIN_RATE_PLAYBACK 8000
+#define UX500_PLATFORM_MAX_RATE_PLAYBACK 48000
+#define UX500_PLATFORM_MIN_RATE_CAPTURE        8000
+#define UX500_PLATFORM_MAX_RATE_CAPTURE        48000
+
+#define UX500_PLATFORM_MIN_CHANNELS 1
+#define UX500_PLATFORM_MAX_CHANNELS 8
+
+#define UX500_PLATFORM_PERIODS_BYTES_MIN       128
+#define UX500_PLATFORM_PERIODS_BYTES_MAX       (64 * PAGE_SIZE)
+#define UX500_PLATFORM_PERIODS_MIN             2
+#define UX500_PLATFORM_PERIODS_MAX             48
+#define UX500_PLATFORM_BUFFER_BYTES_MAX                (2048 * PAGE_SIZE)
+
+#endif