mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 11:01:43 +00:00
046e7d685b
This update contains a fairly wide range of changes all over in sound subdirectory, mainly because of UAPI header moves by David and __dev* annotation removals by Bill. Other highlights are: - Introduced the support for wallclock timestamps in ALSA PCM core - Add the poll loop implementation for HD-audio jack detection - Yet more VGA-switcheroo fixes for HD-audio - New VIA HD-audio codec support - More fixes on resource management in USB audio and MIDI drivers - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite, Roland VG-99, etc - Add support for FastTrack C400 usb-audio - Clean ups in many drivers regarding firmware loading - Add PSC724 Ultiimate Edge support to ice1712 - A few hdspm driver updates - New Stanton SCS.1d/1m FireWire driver - Standardisation of the logging in ASoC codes - DT and dmaengine support for ASoC Atmel - Support for Wolfson ADSP cores - New drivers for Freescale/iVeia P1022 and Maxim MAX98090 - Lots of other ASoC driver fixes and developments -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJQyYh9AAoJEGwxgFQ9KSmk95UP+wcVXRynWulCVwEnVjjWv/UM 2fIsD0RkWO4WoqEVCNCHzW27pvFC36uqLx5vtas4CoJ2CX8ufQsPqWTx6K3MY/DQ /VJT8CI2EKPQY1Q0PySVo2nBqwcUXWWoZE47t1ZowR6cxtmgrS8lLxYJvkbfEOHF PS8WItACqH5F5VPxGFkhPwR2OTLfaYt7ilKx82vgxSzdMAel8q/I9uS/MUv8KV+1 1s5yBvlW5eyDXKpQbP/KiMJLJ/zk1MRAKK2HftAk8pNt+Xy160NvXhbILDWKC4uT QBRPqyIe8BmL3VlXpw3mn7nbeU7rSfc/Rbrnm2+Yb54/Wtj4PnV6Z6bg7HO610im e/tBNHoaL7qn1iNYSC3heW11rToksd03/LK0GREvkX3Bl21T+Naaun/DY/PGIfMQ nOXy7uVo6sVdZnN2MTWof9qeMYBSlrwQVsMde6kbYadNcXnuqUqCOx41kiAdE8t5 jfZy5QR+uDjdJgDv8/CuiCYxSjjTUfO1tdSV/VjsTK17Gfw3DWTJpeznVnoIALbZ 81HXYxb+uGZ8xDr0WXGkydlnPvB6bnWu2vvfrLBkioA/p60EDNCtgKo1y3NzQGh8 P2qILNhXIRrS2EoAScQOb6F1RPsvbDN9PbihnkShX3r7DXyeynr9jgPy3L2vf0bR xyu0jtQiqYb34ss7qqdz =IIsz -----END PGP SIGNATURE----- Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound updates from Takashi Iwai: "This update contains a fairly wide range of changes all over in sound subdirectory, mainly because of UAPI header moves by David and __dev* annotation removals by Bill. Other highlights are: - Introduced the support for wallclock timestamps in ALSA PCM core - Add the poll loop implementation for HD-audio jack detection - Yet more VGA-switcheroo fixes for HD-audio - New VIA HD-audio codec support - More fixes on resource management in USB audio and MIDI drivers - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite, Roland VG-99, etc - Add support for FastTrack C400 usb-audio - Clean ups in many drivers regarding firmware loading - Add PSC724 Ultiimate Edge support to ice1712 - A few hdspm driver updates - New Stanton SCS.1d/1m FireWire driver - Standardisation of the logging in ASoC codes - DT and dmaengine support for ASoC Atmel - Support for Wolfson ADSP cores - New drivers for Freescale/iVeia P1022 and Maxim MAX98090 - Lots of other ASoC driver fixes and developments" Fix up trivial conflicts. And go out on a limb and assume the dts file 'status' field of one of the conflicting things was supposed to be "disabled", not "disable" like in pretty much all other cases. * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits) ALSA: hda - Move runtime PM check to runtime_idle callback ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522 ALSA: hda - Avoid doubly suspend after vga switcheroo ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3 ALSA: hda - Check validity of CORB/RIRB WP reads ALSA: hda - use usleep_range in link reset and change timeout check ALSA: HDA: VIA: Add support for codec VT1808. ALSA: HDA: VIA Add support for codec VT1705CF. ASoC: codecs: remove __dev* attributes ASoC: utils: remove __dev* attributes ASoC: ux500: remove __dev* attributes ASoC: txx9: remove __dev* attributes ASoC: tegra: remove __dev* attributes ASoC: spear: remove __dev* attributes ASoC: sh: remove __dev* attributes ASoC: s6000: remove __dev* attributes ASoC: OMAP: remove __dev* attributes ASoC: nuc900: remove __dev* attributes ASoC: mxs: remove __dev* attributes ASoC: kirkwood: remove __dev* attributes ...
307 lines
7.9 KiB
C
307 lines
7.9 KiB
C
/*
|
|
* 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 <linux/platform_data/dma-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_no_residue,
|
|
.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,
|
|
};
|
|
|
|
int ux500_pcm_register_platform(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;
|
|
}
|
|
EXPORT_SYMBOL_GPL(ux500_pcm_register_platform);
|
|
|
|
int ux500_pcm_unregister_platform(struct platform_device *pdev)
|
|
{
|
|
snd_soc_unregister_platform(&pdev->dev);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(ux500_pcm_unregister_platform);
|