mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 15:41:36 +00:00
f0fba2ad1b
This patch extends the ASoC API to allow sound cards to have more than one CODEC and more than one platform DMA controller. This is achieved by dividing some current ASoC structures that contain both driver data and device data into structures that only either contain device data or driver data. i.e. struct snd_soc_codec ---> struct snd_soc_codec (device data) +-> struct snd_soc_codec_driver (driver data) struct snd_soc_platform ---> struct snd_soc_platform (device data) +-> struct snd_soc_platform_driver (driver data) struct snd_soc_dai ---> struct snd_soc_dai (device data) +-> struct snd_soc_dai_driver (driver data) struct snd_soc_device ---> deleted This now allows ASoC to be more tightly aligned with the Linux driver model and also means that every ASoC codec, platform and (platform) DAI is a kernel device. ASoC component private data is now stored as device private data. The ASoC sound card struct snd_soc_card has also been updated to store lists of it's components rather than a pointer to a codec and platform. The PCM runtime struct soc_pcm_runtime now has pointers to all its components. This patch adds DAPM support for ASoC multi-component and removes struct snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec or runtime PCM level basis rather than using snd_soc_socdev. Other notable multi-component changes:- * Stream operations now de-reference less structures. * close_delayed work() now runs on a DAI basis rather than looping all DAIs in a card. * PM suspend()/resume() operations can now handle N CODECs and Platforms per sound card. * Added soc_bind_dai_link() to bind the component devices to the sound card. * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove DAI link components. * sysfs entries can now be registered per component per card. * snd_soc_new_pcms() functionailty rolled into dai_link_probe(). * snd_soc_register_codec() now does all the codec list and mutex init. This patch changes the probe() and remove() of the CODEC drivers as follows:- o Make CODEC driver a platform driver o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core. o Removed all static codec pointers (drivers now support > 1 codec dev) o snd_soc_register_pcms() now done by core. o snd_soc_register_dai() folded into snd_soc_register_codec(). CS4270 portions: Acked-by: Timur Tabi <timur@freescale.com> Some TLV320aic23 and Cirrus platform fixes. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> TI CODEC and OMAP fixes Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Samsung platform and misc fixes :- Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Seungwhan Youn <sw.youn@samsung.com> MPC8610 and PPC fixes. Signed-off-by: Timur Tabi <timur@freescale.com> i.MX fixes and some core fixes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> J4740 platform fixes:- Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> CC: Tony Lindgren <tony@atomide.com> CC: Nicolas Ferre <nicolas.ferre@atmel.com> CC: Kevin Hilman <khilman@deeprootsystems.com> CC: Sascha Hauer <s.hauer@pengutronix.de> CC: Atsushi Nemoto <anemo@mba.ocn.ne.jp> CC: Kuninori Morimoto <morimoto.kuninori@renesas.com> CC: Daniel Gloeckner <dg@emlix.com> CC: Manuel Lauss <mano@roarinelk.homelinux.net> CC: Mike Frysinger <vapier.adi@gmail.com> CC: Arnaud Patard <apatard@mandriva.com> CC: Wan ZongShun <mcuos.com@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
346 lines
8.2 KiB
C
346 lines
8.2 KiB
C
/*
|
|
* imx-pcm-fiq.c -- ALSA Soc Audio Layer
|
|
*
|
|
* Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de>
|
|
*
|
|
* This code is based on code copyrighted by Freescale,
|
|
* Liam Girdwood, Javier Martin and probably others.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
#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 <sound/core.h>
|
|
#include <sound/initval.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/pcm_params.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include <asm/fiq.h>
|
|
|
|
#include <mach/ssi.h>
|
|
|
|
#include "imx-ssi.h"
|
|
|
|
struct imx_pcm_runtime_data {
|
|
int period;
|
|
int periods;
|
|
unsigned long offset;
|
|
unsigned long last_offset;
|
|
unsigned long size;
|
|
struct hrtimer hrt;
|
|
int poll_time_ns;
|
|
struct snd_pcm_substream *substream;
|
|
atomic_t running;
|
|
};
|
|
|
|
static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
|
|
{
|
|
struct imx_pcm_runtime_data *iprtd =
|
|
container_of(hrt, struct imx_pcm_runtime_data, hrt);
|
|
struct snd_pcm_substream *substream = iprtd->substream;
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct pt_regs regs;
|
|
unsigned long delta;
|
|
|
|
if (!atomic_read(&iprtd->running))
|
|
return HRTIMER_NORESTART;
|
|
|
|
get_fiq_regs(®s);
|
|
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
|
iprtd->offset = regs.ARM_r8 & 0xffff;
|
|
else
|
|
iprtd->offset = regs.ARM_r9 & 0xffff;
|
|
|
|
/* How much data have we transferred since the last period report? */
|
|
if (iprtd->offset >= iprtd->last_offset)
|
|
delta = iprtd->offset - iprtd->last_offset;
|
|
else
|
|
delta = runtime->buffer_size + iprtd->offset
|
|
- iprtd->last_offset;
|
|
|
|
/* If we've transferred at least a period then report it and
|
|
* reset our poll time */
|
|
if (delta >= iprtd->period) {
|
|
snd_pcm_period_elapsed(substream);
|
|
iprtd->last_offset = iprtd->offset;
|
|
}
|
|
|
|
hrtimer_forward_now(hrt, ns_to_ktime(iprtd->poll_time_ns));
|
|
|
|
return HRTIMER_RESTART;
|
|
}
|
|
|
|
static struct fiq_handler fh = {
|
|
.name = DRV_NAME,
|
|
};
|
|
|
|
static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct imx_pcm_runtime_data *iprtd = runtime->private_data;
|
|
|
|
iprtd->size = params_buffer_bytes(params);
|
|
iprtd->periods = params_periods(params);
|
|
iprtd->period = params_period_bytes(params) ;
|
|
iprtd->offset = 0;
|
|
iprtd->last_offset = 0;
|
|
iprtd->poll_time_ns = 1000000000 / params_rate(params) *
|
|
params_period_size(params);
|
|
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct imx_pcm_runtime_data *iprtd = runtime->private_data;
|
|
struct pt_regs regs;
|
|
|
|
get_fiq_regs(®s);
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
|
regs.ARM_r8 = (iprtd->period * iprtd->periods - 1) << 16;
|
|
else
|
|
regs.ARM_r9 = (iprtd->period * iprtd->periods - 1) << 16;
|
|
|
|
set_fiq_regs(®s);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int fiq_enable;
|
|
static int imx_pcm_fiq;
|
|
|
|
static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct imx_pcm_runtime_data *iprtd = runtime->private_data;
|
|
|
|
switch (cmd) {
|
|
case SNDRV_PCM_TRIGGER_START:
|
|
case SNDRV_PCM_TRIGGER_RESUME:
|
|
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
|
|
atomic_set(&iprtd->running, 1);
|
|
hrtimer_start(&iprtd->hrt, ns_to_ktime(iprtd->poll_time_ns),
|
|
HRTIMER_MODE_REL);
|
|
if (++fiq_enable == 1)
|
|
enable_fiq(imx_pcm_fiq);
|
|
|
|
break;
|
|
|
|
case SNDRV_PCM_TRIGGER_STOP:
|
|
case SNDRV_PCM_TRIGGER_SUSPEND:
|
|
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
|
atomic_set(&iprtd->running, 0);
|
|
|
|
if (--fiq_enable == 0)
|
|
disable_fiq(imx_pcm_fiq);
|
|
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static snd_pcm_uframes_t snd_imx_pcm_pointer(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct imx_pcm_runtime_data *iprtd = runtime->private_data;
|
|
|
|
return bytes_to_frames(substream->runtime, iprtd->offset);
|
|
}
|
|
|
|
static struct snd_pcm_hardware snd_imx_hardware = {
|
|
.info = SNDRV_PCM_INFO_INTERLEAVED |
|
|
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
|
SNDRV_PCM_INFO_MMAP |
|
|
SNDRV_PCM_INFO_MMAP_VALID |
|
|
SNDRV_PCM_INFO_PAUSE |
|
|
SNDRV_PCM_INFO_RESUME,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
|
.rate_min = 8000,
|
|
.channels_min = 2,
|
|
.channels_max = 2,
|
|
.buffer_bytes_max = IMX_SSI_DMABUF_SIZE,
|
|
.period_bytes_min = 128,
|
|
.period_bytes_max = 16 * 1024,
|
|
.periods_min = 4,
|
|
.periods_max = 255,
|
|
.fifo_size = 0,
|
|
};
|
|
|
|
static int snd_imx_open(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct imx_pcm_runtime_data *iprtd;
|
|
int ret;
|
|
|
|
iprtd = kzalloc(sizeof(*iprtd), GFP_KERNEL);
|
|
if (iprtd == NULL)
|
|
return -ENOMEM;
|
|
runtime->private_data = iprtd;
|
|
|
|
iprtd->substream = substream;
|
|
|
|
atomic_set(&iprtd->running, 0);
|
|
hrtimer_init(&iprtd->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
|
iprtd->hrt.function = snd_hrtimer_callback;
|
|
|
|
ret = snd_pcm_hw_constraint_integer(substream->runtime,
|
|
SNDRV_PCM_HW_PARAM_PERIODS);
|
|
if (ret < 0) {
|
|
kfree(iprtd);
|
|
return ret;
|
|
}
|
|
|
|
snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware);
|
|
return 0;
|
|
}
|
|
|
|
static int snd_imx_close(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
struct imx_pcm_runtime_data *iprtd = runtime->private_data;
|
|
|
|
hrtimer_cancel(&iprtd->hrt);
|
|
|
|
kfree(iprtd);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_pcm_ops imx_pcm_ops = {
|
|
.open = snd_imx_open,
|
|
.close = snd_imx_close,
|
|
.ioctl = snd_pcm_lib_ioctl,
|
|
.hw_params = snd_imx_pcm_hw_params,
|
|
.prepare = snd_imx_pcm_prepare,
|
|
.trigger = snd_imx_pcm_trigger,
|
|
.pointer = snd_imx_pcm_pointer,
|
|
.mmap = snd_imx_pcm_mmap,
|
|
};
|
|
|
|
static int ssi_irq = 0;
|
|
|
|
static int imx_pcm_fiq_new(struct snd_card *card, struct snd_soc_dai *dai,
|
|
struct snd_pcm *pcm)
|
|
{
|
|
int ret;
|
|
|
|
ret = imx_pcm_new(card, dai, pcm);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (dai->driver->playback.channels_min) {
|
|
struct snd_pcm_substream *substream =
|
|
pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
|
|
struct snd_dma_buffer *buf = &substream->dma_buffer;
|
|
|
|
imx_ssi_fiq_tx_buffer = (unsigned long)buf->area;
|
|
}
|
|
|
|
if (dai->driver->capture.channels_min) {
|
|
struct snd_pcm_substream *substream =
|
|
pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
|
|
struct snd_dma_buffer *buf = &substream->dma_buffer;
|
|
|
|
imx_ssi_fiq_rx_buffer = (unsigned long)buf->area;
|
|
}
|
|
|
|
set_fiq_handler(&imx_ssi_fiq_start,
|
|
&imx_ssi_fiq_end - &imx_ssi_fiq_start);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void imx_pcm_fiq_free(struct snd_pcm *pcm)
|
|
{
|
|
mxc_set_irq_fiq(ssi_irq, 0);
|
|
release_fiq(&fh);
|
|
imx_pcm_free(pcm);
|
|
}
|
|
|
|
static struct snd_soc_platform_driver imx_soc_platform_fiq = {
|
|
.ops = &imx_pcm_ops,
|
|
.pcm_new = imx_pcm_fiq_new,
|
|
.pcm_free = imx_pcm_fiq_free,
|
|
};
|
|
|
|
static int __devinit imx_soc_platform_probe(struct platform_device *pdev)
|
|
{
|
|
struct imx_ssi *ssi = platform_get_drvdata(pdev);
|
|
int ret;
|
|
|
|
ret = claim_fiq(&fh);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to claim fiq: %d", ret);
|
|
return ret;
|
|
}
|
|
|
|
mxc_set_irq_fiq(ssi->irq, 1);
|
|
ssi_irq = ssi->irq;
|
|
|
|
imx_pcm_fiq = ssi->irq;
|
|
|
|
imx_ssi_fiq_base = (unsigned long)ssi->base;
|
|
|
|
ssi->dma_params_tx.burstsize = 4;
|
|
ssi->dma_params_rx.burstsize = 6;
|
|
|
|
ret = snd_soc_register_platform(&pdev->dev, &imx_soc_platform_fiq);
|
|
if (ret)
|
|
goto failed_register;
|
|
|
|
return 0;
|
|
|
|
failed_register:
|
|
mxc_set_irq_fiq(ssi_irq, 0);
|
|
release_fiq(&fh);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int __devexit imx_soc_platform_remove(struct platform_device *pdev)
|
|
{
|
|
snd_soc_unregister_platform(&pdev->dev);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver imx_pcm_driver = {
|
|
.driver = {
|
|
.name = "imx-fiq-pcm-audio",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
|
|
.probe = imx_soc_platform_probe,
|
|
.remove = __devexit_p(imx_soc_platform_remove),
|
|
};
|
|
|
|
static int __init snd_imx_pcm_init(void)
|
|
{
|
|
return platform_driver_register(&imx_pcm_driver);
|
|
}
|
|
module_init(snd_imx_pcm_init);
|
|
|
|
static void __exit snd_imx_pcm_exit(void)
|
|
{
|
|
platform_driver_unregister(&imx_pcm_driver);
|
|
}
|
|
module_exit(snd_imx_pcm_exit);
|