Skip to content

L
linux
Commit dbcc3475 authored by Jon Smirl's avatar Jon Smirl Committed by Mark Brown
Browse files
Options

ASoC: Main rewite of the mpc5200 audio DMA code 

Rewrite the mpc5200 audio DMA code to support both I2S and AC97.
Signed-off-by: default avatarJon Smirl <jonsmirl@gmail.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0f89bdca
Hide whitespace changes
Inline Side-by-side
Showing with 344 additions and 391 deletions
sound/soc/fsl/Kconfig
View file @ dbcc3475
...@@ -25,7 +25,6 @@ config SND_SOC_MPC8610_HPCD ...@@ -25,7 +25,6 @@ config SND_SOC_MPC8610_HPCD
config SND_SOC_MPC5200_I2S config SND_SOC_MPC5200_I2S
tristate "Freescale MPC5200 PSC in I2S mode driver" tristate "Freescale MPC5200 PSC in I2S mode driver"
depends on PPC_MPC52xx && PPC_BESTCOMM depends on PPC_MPC52xx && PPC_BESTCOMM
select SND_SOC_OF_SIMPLE
select SND_MPC52xx_DMA select SND_MPC52xx_DMA
select PPC_BESTCOMM_GEN_BD select PPC_BESTCOMM_GEN_BD
help help
......
sound/soc/fsl/mpc5200_dma.c
View file @ dbcc3475
...@@ -3,23 +3,13 @@ ...@@ -3,23 +3,13 @@
* ALSA SoC Platform driver * ALSA SoC Platform driver
* *
* Copyright (C) 2008 Secret Lab Technologies Ltd. * Copyright (C) 2008 Secret Lab Technologies Ltd.
* Copyright (C) 2009 Jon Smirl, Digispeaker
*/ */
#include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include <linux/delay.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-of-simple.h>
#include <sysdev/bestcomm/bestcomm.h> #include <sysdev/bestcomm/bestcomm.h>
#include <sysdev/bestcomm/gen_bd.h> #include <sysdev/bestcomm/gen_bd.h>
...@@ -27,10 +17,6 @@ ...@@ -27,10 +17,6 @@
#include "mpc5200_dma.h" #include "mpc5200_dma.h"
MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
MODULE_DESCRIPTION("Freescale MPC5200 PSC in DMA mode ASoC Driver");
MODULE_LICENSE("GPL");
/* /*
* Interrupt handlers * Interrupt handlers
*/ */
...@@ -50,7 +36,7 @@ static irqreturn_t psc_dma_status_irq(int irq, void *_psc_dma) ...@@ -50,7 +36,7 @@ static irqreturn_t psc_dma_status_irq(int irq, void *_psc_dma)
if (psc_dma->capture.active && (isr & MPC52xx_PSC_IMR_ORERR)) if (psc_dma->capture.active && (isr & MPC52xx_PSC_IMR_ORERR))
psc_dma->stats.overrun_count++; psc_dma->stats.overrun_count++;
out_8(&regs->command, 4 << 4); /* reset the error status */ out_8(&regs->command, MPC52xx_PSC_RST_ERR_STAT);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -81,21 +67,36 @@ static void psc_dma_bcom_enqueue_next_buffer(struct psc_dma_stream *s) ...@@ -81,21 +67,36 @@ static void psc_dma_bcom_enqueue_next_buffer(struct psc_dma_stream *s)
s->period_next_pt = s->period_start; s->period_next_pt = s->period_start;
} }
static void psc_dma_bcom_enqueue_tx(struct psc_dma_stream *s)
{
while (s->appl_ptr < s->runtime->control->appl_ptr) {
if (bcom_queue_full(s->bcom_task))
return;
s->appl_ptr += s->period_size;
psc_dma_bcom_enqueue_next_buffer(s);
}
}
/* Bestcomm DMA irq handler */ /* Bestcomm DMA irq handler */
static irqreturn_t psc_dma_bcom_irq(int irq, void *_psc_dma_stream) static irqreturn_t psc_dma_bcom_irq_tx(int irq, void *_psc_dma_stream)
{ {
struct psc_dma_stream *s = _psc_dma_stream; struct psc_dma_stream *s = _psc_dma_stream;
spin_lock(&s->psc_dma->lock);
/* For each finished period, dequeue the completed period buffer /* For each finished period, dequeue the completed period buffer
* and enqueue a new one in it's place. */ * and enqueue a new one in it's place. */
while (bcom_buffer_done(s->bcom_task)) { while (bcom_buffer_done(s->bcom_task)) {
bcom_retrieve_buffer(s->bcom_task, NULL, NULL); bcom_retrieve_buffer(s->bcom_task, NULL, NULL);
s->period_current_pt += s->period_bytes; s->period_current_pt += s->period_bytes;
if (s->period_current_pt >= s->period_end) if (s->period_current_pt >= s->period_end)
s->period_current_pt = s->period_start; s->period_current_pt = s->period_start;
psc_dma_bcom_enqueue_next_buffer(s);
bcom_enable(s->bcom_task);
} }
psc_dma_bcom_enqueue_tx(s);
spin_unlock(&s->psc_dma->lock);
/* If the stream is active, then also inform the PCM middle layer /* If the stream is active, then also inform the PCM middle layer
* of the period finished event. */ * of the period finished event. */
...@@ -105,49 +106,33 @@ static irqreturn_t psc_dma_bcom_irq(int irq, void *_psc_dma_stream) ...@@ -105,49 +106,33 @@ static irqreturn_t psc_dma_bcom_irq(int irq, void *_psc_dma_stream)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/** static irqreturn_t psc_dma_bcom_irq_rx(int irq, void *_psc_dma_stream)
* psc_dma_startup: create a new substream
*
* This is the first function called when a stream is opened.
*
* If this is the first stream open, then grab the IRQ and program most of
* the PSC registers.
*/
int psc_dma_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct psc_dma_stream *s = _psc_dma_stream;
struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
int rc;
dev_dbg(psc_dma->dev, "psc_dma_startup(substream=%p)\n", substream); spin_lock(&s->psc_dma->lock);
/* For each finished period, dequeue the completed period buffer
* and enqueue a new one in it's place. */
while (bcom_buffer_done(s->bcom_task)) {
bcom_retrieve_buffer(s->bcom_task, NULL, NULL);
if (!psc_dma->playback.active && s->period_current_pt += s->period_bytes;
!psc_dma->capture.active) { if (s->period_current_pt >= s->period_end)
/* Setup the IRQs */ s->period_current_pt = s->period_start;
rc = request_irq(psc_dma->irq, &psc_dma_status_irq, IRQF_SHARED,
"psc-dma-status", psc_dma); psc_dma_bcom_enqueue_next_buffer(s);
rc |= request_irq(psc_dma->capture.irq,
&psc_dma_bcom_irq, IRQF_SHARED,
"psc-dma-capture", &psc_dma->capture);
rc |= request_irq(psc_dma->playback.irq,
&psc_dma_bcom_irq, IRQF_SHARED,
"psc-dma-playback", &psc_dma->playback);
if (rc) {
free_irq(psc_dma->irq, psc_dma);
free_irq(psc_dma->capture.irq,
&psc_dma->capture);
free_irq(psc_dma->playback.irq,
&psc_dma->playback);
return -ENODEV;
}
} }
spin_unlock(&s->psc_dma->lock);
return 0; /* If the stream is active, then also inform the PCM middle layer
* of the period finished event. */
if (s->active)
snd_pcm_period_elapsed(s->stream);
return IRQ_HANDLED;
} }
int psc_dma_hw_free(struct snd_pcm_substream *substream, static int psc_dma_hw_free(struct snd_pcm_substream *substream)
struct snd_soc_dai *dai)
{ {
snd_pcm_set_runtime_buffer(substream, NULL); snd_pcm_set_runtime_buffer(substream, NULL);
return 0; return 0;
...@@ -159,8 +144,7 @@ int psc_dma_hw_free(struct snd_pcm_substream *substream, ...@@ -159,8 +144,7 @@ int psc_dma_hw_free(struct snd_pcm_substream *substream,
* This function is called by ALSA to start, stop, pause, and resume the DMA * This function is called by ALSA to start, stop, pause, and resume the DMA
* transfer of data. * transfer of data.
*/ */
int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd, static int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd)
struct snd_soc_dai *dai)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
...@@ -168,8 +152,8 @@ int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -168,8 +152,8 @@ int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
struct psc_dma_stream *s; struct psc_dma_stream *s;
struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs;
u16 imr; u16 imr;
u8 psc_cmd;
unsigned long flags; unsigned long flags;
int i;
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
s = &psc_dma->capture; s = &psc_dma->capture;
...@@ -189,68 +173,48 @@ int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -189,68 +173,48 @@ int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
(s->period_bytes * runtime->periods); (s->period_bytes * runtime->periods);
s->period_next_pt = s->period_start; s->period_next_pt = s->period_start;
s->period_current_pt = s->period_start; s->period_current_pt = s->period_start;
s->period_size = runtime->period_size;
s->active = 1; s->active = 1;
/* First; reset everything */ /* track appl_ptr so that we have a better chance of detecting
* end of stream and not over running it.
*/
s->runtime = runtime;
s->appl_ptr = s->runtime->control->appl_ptr -
(runtime->period_size * runtime->periods);
/* Fill up the bestcomm bd queue and enable DMA.
* This will begin filling the PSC's fifo.
*/
spin_lock_irqsave(&psc_dma->lock, flags);
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) { if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) {
out_8(&regs->command, MPC52xx_PSC_RST_RX); bcom_gen_bd_rx_reset(s->bcom_task);
out_8(&regs->command, MPC52xx_PSC_RST_ERR_STAT); for (i = 0; i < runtime->periods; i++)
if (!bcom_queue_full(s->bcom_task))
psc_dma_bcom_enqueue_next_buffer(s);
} else { } else {
out_8(&regs->command, MPC52xx_PSC_RST_TX); bcom_gen_bd_tx_reset(s->bcom_task);
out_8(&regs->command, MPC52xx_PSC_RST_ERR_STAT); psc_dma_bcom_enqueue_tx(s);
} }
/* Next, fill up the bestcomm bd queue and enable DMA.
* This will begin filling the PSC's fifo. */
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
bcom_gen_bd_rx_reset(s->bcom_task);
else
bcom_gen_bd_tx_reset(s->bcom_task);
while (!bcom_queue_full(s->bcom_task))
psc_dma_bcom_enqueue_next_buffer(s);
bcom_enable(s->bcom_task); bcom_enable(s->bcom_task);
/* Due to errata in the dma mode; need to line up enabling
* the transmitter with a transition on the frame sync
* line */
spin_lock_irqsave(&psc_dma->lock, flags);
/* first make sure it is low */
while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) != 0)
;
/* then wait for the transition to high */
while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) == 0)
;
/* Finally, enable the PSC.
* Receiver must always be enabled; even when we only want
* transmit. (see 15.3.2.3 of MPC5200B User's Guide) */
psc_cmd = MPC52xx_PSC_RX_ENABLE;
if (substream->pstr->stream == SNDRV_PCM_STREAM_PLAYBACK)
psc_cmd |= MPC52xx_PSC_TX_ENABLE;
out_8(&regs->command, psc_cmd);
spin_unlock_irqrestore(&psc_dma->lock, flags); spin_unlock_irqrestore(&psc_dma->lock, flags);
out_8(&regs->command, MPC52xx_PSC_RST_ERR_STAT);
break; break;
case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_STOP:
/* Turn off the PSC */
s->active = 0; s->active = 0;
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) {
if (!psc_dma->playback.active) {
out_8(&regs->command, 2 << 4); /* reset rx */
out_8(&regs->command, 3 << 4); /* reset tx */
out_8(&regs->command, 4 << 4); /* reset err */
}
} else {
out_8(&regs->command, 3 << 4); /* reset tx */
out_8(&regs->command, 4 << 4); /* reset err */
if (!psc_dma->capture.active)
out_8(&regs->command, 2 << 4); /* reset rx */
}
spin_lock_irqsave(&psc_dma->lock, flags);
bcom_disable(s->bcom_task); bcom_disable(s->bcom_task);
while (!bcom_queue_empty(s->bcom_task)) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
bcom_retrieve_buffer(s->bcom_task, NULL, NULL); bcom_gen_bd_rx_reset(s->bcom_task);
else
bcom_gen_bd_tx_reset(s->bcom_task);
spin_unlock_irqrestore(&psc_dma->lock, flags);
break; break;
...@@ -265,44 +229,11 @@ int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -265,44 +229,11 @@ int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
imr |= MPC52xx_PSC_IMR_TXEMP; imr |= MPC52xx_PSC_IMR_TXEMP;
if (psc_dma->capture.active) if (psc_dma->capture.active)
imr |= MPC52xx_PSC_IMR_ORERR; imr |= MPC52xx_PSC_IMR_ORERR;
out_be16(&regs->isr_imr.imr, imr); out_be16(&regs->isr_imr.imr, psc_dma->imr | imr);
return 0; return 0;
} }
/**
* psc_dma_shutdown: shutdown the data transfer on a stream
*
* Shutdown the PSC if there are no other substreams open.
*/
void psc_dma_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
dev_dbg(psc_dma->dev, "psc_dma_shutdown(substream=%p)\n", substream);
/*
* If this is the last active substream, disable the PSC and release
* the IRQ.
*/
if (!psc_dma->playback.active &&
!psc_dma->capture.active) {
/* Disable all interrupts and reset the PSC */
out_be16(&psc_dma->psc_regs->isr_imr.imr, 0);
out_8(&psc_dma->psc_regs->command, 3 << 4); /* reset tx */
out_8(&psc_dma->psc_regs->command, 2 << 4); /* reset rx */
out_8(&psc_dma->psc_regs->command, 1 << 4); /* reset mode */
out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error */
/* Release irqs */
free_irq(psc_dma->irq, psc_dma);
free_irq(psc_dma->capture.irq, &psc_dma->capture);
free_irq(psc_dma->playback.irq, &psc_dma->playback);
}
}
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
* The PSC DMA 'ASoC platform' driver * The PSC DMA 'ASoC platform' driver
...@@ -312,62 +243,78 @@ void psc_dma_shutdown(struct snd_pcm_substream *substream, ...@@ -312,62 +243,78 @@ void psc_dma_shutdown(struct snd_pcm_substream *substream,
* interaction with the attached codec * interaction with the attached codec
*/ */
static const struct snd_pcm_hardware psc_dma_pcm_hardware = { static const struct snd_pcm_hardware psc_dma_hardware = {
.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_BATCH, SNDRV_PCM_INFO_BATCH,
.formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE |
SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE, SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE,
.rate_min = 8000, .rate_min = 8000,
.rate_max = 48000, .rate_max = 48000,
.channels_min = 2, .channels_min = 1,
.channels_max = 2, .channels_max = 2,
.period_bytes_max = 1024 * 1024, .period_bytes_max = 1024 * 1024,
.period_bytes_min = 32, .period_bytes_min = 32,
.periods_min = 2, .periods_min = 2,
.periods_max = 256, .periods_max = 256,
.buffer_bytes_max = 2 * 1024 * 1024, .buffer_bytes_max = 2 * 1024 * 1024,
.fifo_size = 0, .fifo_size = 512,
}; };
static int psc_dma_pcm_open(struct snd_pcm_substream *substream) static int psc_dma_open(struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
struct psc_dma_stream *s; struct psc_dma_stream *s;
int rc;
dev_dbg(psc_dma->dev, "psc_dma_pcm_open(substream=%p)\n", substream); dev_dbg(psc_dma->dev, "psc_dma_open(substream=%p)\n", substream);
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
s = &psc_dma->capture; s = &psc_dma->capture;
else else
s = &psc_dma->playback; s = &psc_dma->playback;
snd_soc_set_runtime_hwparams(substream, &psc_dma_pcm_hardware); snd_soc_set_runtime_hwparams(substream, &psc_dma_hardware);
rc = snd_pcm_hw_constraint_integer(runtime,
SNDRV_PCM_HW_PARAM_PERIODS);
if (rc < 0) {
dev_err(substream->pcm->card->dev, "invalid buffer size\n");
return rc;
}
s->stream = substream; s->stream = substream;
return 0; return 0;
} }
static int psc_dma_pcm_close(struct snd_pcm_substream *substream) static int psc_dma_close(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
struct psc_dma_stream *s; struct psc_dma_stream *s;
dev_dbg(psc_dma->dev, "psc_dma_pcm_close(substream=%p)\n", substream); dev_dbg(psc_dma->dev, "psc_dma_close(substream=%p)\n", substream);
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
s = &psc_dma->capture; s = &psc_dma->capture;
else else
s = &psc_dma->playback; s = &psc_dma->playback;
if (!psc_dma->playback.active &&
!psc_dma->capture.active) {
/* Disable all interrupts and reset the PSC */
out_be16(&psc_dma->psc_regs->isr_imr.imr, psc_dma->imr);
out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error */
}
s->stream = NULL; s->stream = NULL;
return 0; return 0;
} }
static snd_pcm_uframes_t static snd_pcm_uframes_t
psc_dma_pcm_pointer(struct snd_pcm_substream *substream) psc_dma_pointer(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
...@@ -384,60 +331,78 @@ psc_dma_pcm_pointer(struct snd_pcm_substream *substream) ...@@ -384,60 +331,78 @@ psc_dma_pcm_pointer(struct snd_pcm_substream *substream)
return bytes_to_frames(substream->runtime, count); return bytes_to_frames(substream->runtime, count);
} }
static struct snd_pcm_ops psc_dma_pcm_ops = { static int
.open = psc_dma_pcm_open, psc_dma_hw_params(struct snd_pcm_substream *substream,
.close = psc_dma_pcm_close, struct snd_pcm_hw_params *params)
{
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
return 0;
}
static struct snd_pcm_ops psc_dma_ops = {
.open = psc_dma_open,
.close = psc_dma_close,
.hw_free = psc_dma_hw_free,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.pointer = psc_dma_pcm_pointer, .pointer = psc_dma_pointer,
.trigger = psc_dma_trigger,
.hw_params = psc_dma_hw_params,
}; };
static u64 psc_dma_pcm_dmamask = 0xffffffff; static u64 psc_dma_dmamask = 0xffffffff;
static int psc_dma_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, static int psc_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
struct snd_pcm *pcm) struct snd_pcm *pcm)
{ {
struct snd_soc_pcm_runtime *rtd = pcm->private_data; struct snd_soc_pcm_runtime *rtd = pcm->private_data;
size_t size = psc_dma_pcm_hardware.buffer_bytes_max; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
size_t size = psc_dma_hardware.buffer_bytes_max;
int rc = 0; int rc = 0;
dev_dbg(rtd->socdev->dev, "psc_dma_pcm_new(card=%p, dai=%p, pcm=%p)\n", dev_dbg(rtd->socdev->dev, "psc_dma_new(card=%p, dai=%p, pcm=%p)\n",
card, dai, pcm); card, dai, pcm);
if (!card->dev->dma_mask) if (!card->dev->dma_mask)
card->dev->dma_mask = &psc_dma_pcm_dmamask; card->dev->dma_mask = &psc_dma_dmamask;
if (!card->dev->coherent_dma_mask) if (!card->dev->coherent_dma_mask)
card->dev->coherent_dma_mask = 0xffffffff; card->dev->coherent_dma_mask = 0xffffffff;
if (pcm->streams[0].substream) { if (pcm->streams[0].substream) {
rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->dev, size, rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev,
&pcm->streams[0].substream->dma_buffer); size, &pcm->streams[0].substream->dma_buffer);
if (rc) if (rc)
goto playback_alloc_err; goto playback_alloc_err;
} }
if (pcm->streams[1].substream) { if (pcm->streams[1].substream) {
rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->dev, size, rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev,
&pcm->streams[1].substream->dma_buffer); size, &pcm->streams[1].substream->dma_buffer);
if (rc) if (rc)
goto capture_alloc_err; goto capture_alloc_err;
} }
if (rtd->socdev->card->codec->ac97)
rtd->socdev->card->codec->ac97->private_data = psc_dma;
return 0; return 0;
capture_alloc_err: capture_alloc_err:
if (pcm->streams[0].substream) if (pcm->streams[0].substream)
snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer); snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer);
playback_alloc_err: playback_alloc_err:
dev_err(card->dev, "Cannot allocate buffer(s)\n"); dev_err(card->dev, "Cannot allocate buffer(s)\n");
return -ENOMEM; return -ENOMEM;
} }
static void psc_dma_pcm_free(struct snd_pcm *pcm) static void psc_dma_free(struct snd_pcm *pcm)
{ {
struct snd_soc_pcm_runtime *rtd = pcm->private_data; struct snd_soc_pcm_runtime *rtd = pcm->private_data;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
int stream; int stream;
dev_dbg(rtd->socdev->dev, "psc_dma_pcm_free(pcm=%p)\n", pcm); dev_dbg(rtd->socdev->dev, "psc_dma_free(pcm=%p)\n", pcm);
for (stream = 0; stream < 2; stream++) { for (stream = 0; stream < 2; stream++) {
substream = pcm->streams[stream].substream; substream = pcm->streams[stream].substream;
...@@ -449,10 +414,151 @@ static void psc_dma_pcm_free(struct snd_pcm *pcm) ...@@ -449,10 +414,151 @@ static void psc_dma_pcm_free(struct snd_pcm *pcm)
} }
} }
struct snd_soc_platform psc_dma_pcm_soc_platform = { struct snd_soc_platform mpc5200_audio_dma_platform = {
.name = "mpc5200-psc-audio", .name = "mpc5200-psc-audio",
.pcm_ops = &psc_dma_pcm_ops, .pcm_ops = &psc_dma_ops,
.pcm_new = &psc_dma_pcm_new, .pcm_new = &psc_dma_new,
.pcm_free = &psc_dma_pcm_free, .pcm_free = &psc_dma_free,
}; };
EXPORT_SYMBOL_GPL(mpc5200_audio_dma_platform);
int mpc5200_audio_dma_create(struct of_device *op)
{
phys_addr_t fifo;
struct psc_dma *psc_dma;
struct resource res;
int size, irq, rc;
const __be32 *prop;
void __iomem *regs;
/* Fetch the registers and IRQ of the PSC */
irq = irq_of_parse_and_map(op->node, 0);
if (of_address_to_resource(op->node, 0, &res)) {
dev_err(&op->dev, "Missing reg property\n");
return -ENODEV;
}
regs = ioremap(res.start, 1 + res.end - res.start);
if (!regs) {
dev_err(&op->dev, "Could not map registers\n");
return -ENODEV;
}
/* Allocate and initialize the driver private data */
psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL);
if (!psc_dma) {
iounmap(regs);
return -ENOMEM;
}
/* Get the PSC ID */
prop = of_get_property(op->node, "cell-index", &size);
if (!prop || size < sizeof *prop)
return -ENODEV;
spin_lock_init(&psc_dma->lock);
psc_dma->id = be32_to_cpu(*prop);
psc_dma->irq = irq;
psc_dma->psc_regs = regs;
psc_dma->fifo_regs = regs + sizeof *psc_dma->psc_regs;
psc_dma->dev = &op->dev;
psc_dma->playback.psc_dma = psc_dma;
psc_dma->capture.psc_dma = psc_dma;
snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc_dma->id);
/* Find the address of the fifo data registers and setup the
* DMA tasks */
fifo = res.start + offsetof(struct mpc52xx_psc, buffer.buffer_32);
psc_dma->capture.bcom_task =
bcom_psc_gen_bd_rx_init(psc_dma->id, 10, fifo, 512);
psc_dma->playback.bcom_task =
bcom_psc_gen_bd_tx_init(psc_dma->id, 10, fifo);
if (!psc_dma->capture.bcom_task ||
!psc_dma->playback.bcom_task) {
dev_err(&op->dev, "Could not allocate bestcomm tasks\n");
iounmap(regs);
kfree(psc_dma);
return -ENODEV;
}
/* Disable all interrupts and reset the PSC */
out_be16(&psc_dma->psc_regs->isr_imr.imr, psc_dma->imr);
/* reset receiver */
out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_RST_RX);
/* reset transmitter */
out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_RST_TX);
/* reset error */
out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_RST_ERR_STAT);
/* reset mode */
out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_SEL_MODE_REG_1);
/* Set up mode register;
* First write: RxRdy (FIFO Alarm) generates rx FIFO irq
* Second write: register Normal mode for non loopback
*/
out_8(&psc_dma->psc_regs->mode, 0);
out_8(&psc_dma->psc_regs->mode, 0);
/* Set the TX and RX fifo alarm thresholds */
out_be16(&psc_dma->fifo_regs->rfalarm, 0x100);
out_8(&psc_dma->fifo_regs->rfcntl, 0x4);
out_be16(&psc_dma->fifo_regs->tfalarm, 0x100);
out_8(&psc_dma->fifo_regs->tfcntl, 0x7);
/* Lookup the IRQ numbers */
psc_dma->playback.irq =
bcom_get_task_irq(psc_dma->playback.bcom_task);
psc_dma->capture.irq =
bcom_get_task_irq(psc_dma->capture.bcom_task);
rc = request_irq(psc_dma->irq, &psc_dma_status_irq, IRQF_SHARED,
"psc-dma-status", psc_dma);
rc |= request_irq(psc_dma->capture.irq,
&psc_dma_bcom_irq_rx, IRQF_SHARED,
"psc-dma-capture", &psc_dma->capture);
rc |= request_irq(psc_dma->playback.irq,
&psc_dma_bcom_irq_tx, IRQF_SHARED,
"psc-dma-playback", &psc_dma->playback);
if (rc) {
free_irq(psc_dma->irq, psc_dma);
free_irq(psc_dma->capture.irq,
&psc_dma->capture);
free_irq(psc_dma->playback.irq,
&psc_dma->playback);
return -ENODEV;
}
/* Save what we've done so it can be found again later */
dev_set_drvdata(&op->dev, psc_dma);
/* Tell the ASoC OF helpers about it */
return snd_soc_register_platform(&mpc5200_audio_dma_platform);
}
EXPORT_SYMBOL_GPL(mpc5200_audio_dma_create);
int mpc5200_audio_dma_destroy(struct of_device *op)
{
struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
dev_dbg(&op->dev, "mpc5200_audio_dma_destroy()\n");
snd_soc_unregister_platform(&mpc5200_audio_dma_platform);
bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
/* Release irqs */
free_irq(psc_dma->irq, psc_dma);
free_irq(psc_dma->capture.irq, &psc_dma->capture);
free_irq(psc_dma->playback.irq, &psc_dma->playback);
iounmap(psc_dma->psc_regs);
kfree(psc_dma);
dev_set_drvdata(&op->dev, NULL);
return 0;
}
EXPORT_SYMBOL_GPL(mpc5200_audio_dma_destroy);
MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
MODULE_DESCRIPTION("Freescale MPC5200 PSC in DMA mode ASoC Driver");
MODULE_LICENSE("GPL");
sound/soc/fsl/mpc5200_dma.h
View file @ dbcc3475
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
#ifndef __SOUND_SOC_FSL_MPC5200_DMA_H__ #ifndef __SOUND_SOC_FSL_MPC5200_DMA_H__
#define __SOUND_SOC_FSL_MPC5200_DMA_H__ #define __SOUND_SOC_FSL_MPC5200_DMA_H__
#define PSC_STREAM_NAME_LEN 32
/** /**
* psc_dma_stream - Data specific to a single stream (playback or capture) * psc_ac97_stream - Data specific to a single stream (playback or capture)
* @active: flag indicating if the stream is active * @active: flag indicating if the stream is active
* @psc_dma: pointer back to parent psc_dma data structure * @psc_dma: pointer back to parent psc_dma data structure
* @bcom_task: bestcomm task structure * @bcom_task: bestcomm task structure
...@@ -17,6 +19,9 @@ ...@@ -17,6 +19,9 @@
* @period_bytes: size of DMA period in bytes * @period_bytes: size of DMA period in bytes
*/ */
struct psc_dma_stream { struct psc_dma_stream {
struct snd_pcm_runtime *runtime;
snd_pcm_uframes_t appl_ptr;
int active; int active;
struct psc_dma *psc_dma; struct psc_dma *psc_dma;
struct bcom_task *bcom_task; struct bcom_task *bcom_task;
...@@ -27,6 +32,7 @@ struct psc_dma_stream { ...@@ -27,6 +32,7 @@ struct psc_dma_stream {
dma_addr_t period_next_pt; dma_addr_t period_next_pt;
dma_addr_t period_current_pt; dma_addr_t period_current_pt;
int period_bytes; int period_bytes;
int period_size;
}; };
/** /**
...@@ -48,9 +54,12 @@ struct psc_dma { ...@@ -48,9 +54,12 @@ struct psc_dma {
struct mpc52xx_psc_fifo __iomem *fifo_regs; struct mpc52xx_psc_fifo __iomem *fifo_regs;
unsigned int irq; unsigned int irq;
struct device *dev; struct device *dev;
struct snd_soc_dai dai;
spinlock_t lock; spinlock_t lock;
u32 sicr; u32 sicr;
uint sysclk;
int imr;
int id;
unsigned int slots;
/* per-stream data */ /* per-stream data */
struct psc_dma_stream playback; struct psc_dma_stream playback;
...@@ -58,24 +67,14 @@ struct psc_dma { ...@@ -58,24 +67,14 @@ struct psc_dma {
/* Statistics */ /* Statistics */
struct { struct {
int overrun_count; unsigned long overrun_count;
int underrun_count; unsigned long underrun_count;
} stats; } stats;
}; };
int mpc5200_audio_dma_create(struct of_device *op);
int mpc5200_audio_dma_destroy(struct of_device *op);
int psc_dma_startup(struct snd_pcm_substream *substream, extern struct snd_soc_platform mpc5200_audio_dma_platform;
struct snd_soc_dai *dai);
int psc_dma_hw_free(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai);
void psc_dma_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai);
int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *dai);
extern struct snd_soc_platform psc_dma_pcm_soc_platform;
#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */ #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */
sound/soc/fsl/mpc5200_psc_i2s.c
View file @ dbcc3475
...@@ -3,34 +3,22 @@ ...@@ -3,34 +3,22 @@
* ALSA SoC Digital Audio Interface (DAI) driver * ALSA SoC Digital Audio Interface (DAI) driver
* *
* Copyright (C) 2008 Secret Lab Technologies Ltd. * Copyright (C) 2008 Secret Lab Technologies Ltd.
* Copyright (C) 2009 Jon Smirl, Digispeaker
*/ */
#include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include <linux/delay.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-of-simple.h>
#include <sysdev/bestcomm/bestcomm.h>
#include <sysdev/bestcomm/gen_bd.h>
#include <asm/mpc52xx_psc.h> #include <asm/mpc52xx_psc.h>
#include "mpc5200_psc_i2s.h"
#include "mpc5200_dma.h" #include "mpc5200_dma.h"
MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
MODULE_DESCRIPTION("Freescale MPC5200 PSC in I2S mode ASoC Driver");
MODULE_LICENSE("GPL");
/** /**
* PSC_I2S_RATES: sample rates supported by the I2S * PSC_I2S_RATES: sample rates supported by the I2S
* *
...@@ -46,8 +34,7 @@ MODULE_LICENSE("GPL"); ...@@ -46,8 +34,7 @@ MODULE_LICENSE("GPL");
* PSC_I2S_FORMATS: audio formats supported by the PSC I2S mode * PSC_I2S_FORMATS: audio formats supported by the PSC I2S mode
*/ */
#define PSC_I2S_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | \ #define PSC_I2S_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | \
SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S24_BE | \ SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE)
SNDRV_PCM_FMTBIT_S32_BE)
static int psc_i2s_hw_params(struct snd_pcm_substream *substream, static int psc_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
...@@ -82,8 +69,6 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -82,8 +69,6 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream,
} }
out_be32(&psc_dma->psc_regs->sicr, psc_dma->sicr | mode); out_be32(&psc_dma->psc_regs->sicr, psc_dma->sicr | mode);
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
return 0; return 0;
} }
...@@ -140,16 +125,13 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format) ...@@ -140,16 +125,13 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
* psc_i2s_dai_template: template CPU Digital Audio Interface * psc_i2s_dai_template: template CPU Digital Audio Interface
*/ */
static struct snd_soc_dai_ops psc_i2s_dai_ops = { static struct snd_soc_dai_ops psc_i2s_dai_ops = {
.startup = psc_dma_startup,
.hw_params = psc_i2s_hw_params, .hw_params = psc_i2s_hw_params,
.hw_free = psc_dma_hw_free,
.shutdown = psc_dma_shutdown,
.trigger = psc_dma_trigger,
.set_sysclk = psc_i2s_set_sysclk, .set_sysclk = psc_i2s_set_sysclk,
.set_fmt = psc_i2s_set_fmt, .set_fmt = psc_i2s_set_fmt,
}; };
static struct snd_soc_dai psc_i2s_dai_template = { struct snd_soc_dai psc_i2s_dai[] = {{
.name = "I2S",
.playback = { .playback = {
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
...@@ -163,71 +145,8 @@ static struct snd_soc_dai psc_i2s_dai_template = { ...@@ -163,71 +145,8 @@ static struct snd_soc_dai psc_i2s_dai_template = {
.formats = PSC_I2S_FORMATS, .formats = PSC_I2S_FORMATS,
}, },
.ops = &psc_i2s_dai_ops, .ops = &psc_i2s_dai_ops,
}; } };
EXPORT_SYMBOL_GPL(psc_i2s_dai);
/* ---------------------------------------------------------------------
* Sysfs attributes for debugging
*/
static ssize_t psc_i2s_status_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct psc_dma *psc_dma = dev_get_drvdata(dev);
return sprintf(buf, "status=%.4x sicr=%.8x rfnum=%i rfstat=0x%.4x "
"tfnum=%i tfstat=0x%.4x\n",
in_be16(&psc_dma->psc_regs->sr_csr.status),
in_be32(&psc_dma->psc_regs->sicr),
in_be16(&psc_dma->fifo_regs->rfnum) & 0x1ff,
in_be16(&psc_dma->fifo_regs->rfstat),
in_be16(&psc_dma->fifo_regs->tfnum) & 0x1ff,
in_be16(&psc_dma->fifo_regs->tfstat));
}
static int *psc_i2s_get_stat_attr(struct psc_dma *psc_dma, const char *name)
{
if (strcmp(name, "playback_underrun") == 0)
return &psc_dma->stats.underrun_count;
if (strcmp(name, "capture_overrun") == 0)
return &psc_dma->stats.overrun_count;
return NULL;
}
static ssize_t psc_i2s_stat_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct psc_dma *psc_dma = dev_get_drvdata(dev);
int *attrib;
attrib = psc_i2s_get_stat_attr(psc_dma, attr->attr.name);
if (!attrib)
return 0;
return sprintf(buf, "%i\n", *attrib);
}
static ssize_t psc_i2s_stat_store(struct device *dev,
struct device_attribute *attr,
const char *buf,
size_t count)
{
struct psc_dma *psc_dma = dev_get_drvdata(dev);
int *attrib;
attrib = psc_i2s_get_stat_attr(psc_dma, attr->attr.name);
if (!attrib)
return 0;
*attrib = simple_strtoul(buf, NULL, 0);
return count;
}
static DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL);
static DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show,
psc_i2s_stat_store);
static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show,
psc_i2s_stat_store);
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
* OF platform bus binding code: * OF platform bus binding code:
...@@ -237,82 +156,26 @@ static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show, ...@@ -237,82 +156,26 @@ static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show,
static int __devinit psc_i2s_of_probe(struct of_device *op, static int __devinit psc_i2s_of_probe(struct of_device *op,
const struct of_device_id *match) const struct of_device_id *match)
{ {
phys_addr_t fifo; int rc;
struct psc_dma *psc_dma; struct psc_dma *psc_dma;
struct resource res; struct mpc52xx_psc __iomem *regs;
int size, psc_id, irq, rc;
const __be32 *prop;
void __iomem *regs;
dev_dbg(&op->dev, "probing psc i2s device\n");
/* Get the PSC ID */
prop = of_get_property(op->node, "cell-index", &size);
if (!prop || size < sizeof *prop)
return -ENODEV;
psc_id = be32_to_cpu(*prop);
/* Fetch the registers and IRQ of the PSC */
irq = irq_of_parse_and_map(op->node, 0);
if (of_address_to_resource(op->node, 0, &res)) {
dev_err(&op->dev, "Missing reg property\n");
return -ENODEV;
}
regs = ioremap(res.start, 1 + res.end - res.start);
if (!regs) {
dev_err(&op->dev, "Could not map registers\n");
return -ENODEV;
}
/* Allocate and initialize the driver private data */ rc = mpc5200_audio_dma_create(op);
psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL); if (rc != 0)
if (!psc_dma) { return rc;
iounmap(regs);
return -ENOMEM; rc = snd_soc_register_dais(psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
} if (rc != 0) {
spin_lock_init(&psc_dma->lock); pr_err("Failed to register DAI\n");
psc_dma->irq = irq; return 0;
psc_dma->psc_regs = regs;
psc_dma->fifo_regs = regs + sizeof *psc_dma->psc_regs;
psc_dma->dev = &op->dev;
psc_dma->playback.psc_dma = psc_dma;
psc_dma->capture.psc_dma = psc_dma;
snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc_id+1);
/* Fill out the CPU DAI structure */
memcpy(&psc_dma->dai, &psc_i2s_dai_template, sizeof psc_dma->dai);
psc_dma->dai.private_data = psc_dma;
psc_dma->dai.name = psc_dma->name;
psc_dma->dai.id = psc_id;
/* Find the address of the fifo data registers and setup the
* DMA tasks */
fifo = res.start + offsetof(struct mpc52xx_psc, buffer.buffer_32);
psc_dma->capture.bcom_task =
bcom_psc_gen_bd_rx_init(psc_id, 10, fifo, 512);
psc_dma->playback.bcom_task =
bcom_psc_gen_bd_tx_init(psc_id, 10, fifo);
if (!psc_dma->capture.bcom_task ||
!psc_dma->playback.bcom_task) {
dev_err(&op->dev, "Could not allocate bestcomm tasks\n");
iounmap(regs);
kfree(psc_dma);
return -ENODEV;
} }
/* Disable all interrupts and reset the PSC */ psc_dma = dev_get_drvdata(&op->dev);
out_be16(&psc_dma->psc_regs->isr_imr.imr, 0); regs = psc_dma->psc_regs;
out_8(&psc_dma->psc_regs->command, 3 << 4); /* reset transmitter */
out_8(&psc_dma->psc_regs->command, 2 << 4); /* reset receiver */
out_8(&psc_dma->psc_regs->command, 1 << 4); /* reset mode */
out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error */
/* Configure the serial interface mode; defaulting to CODEC8 mode */ /* Configure the serial interface mode; defaulting to CODEC8 mode */
psc_dma->sicr = MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_I2S | psc_dma->sicr = MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_I2S |
MPC52xx_PSC_SICR_CLKPOL; MPC52xx_PSC_SICR_CLKPOL;
if (of_get_property(op->node, "fsl,cellslave", NULL))
psc_dma->sicr |= MPC52xx_PSC_SICR_CELLSLAVE |
MPC52xx_PSC_SICR_GENCLK;
out_be32(&psc_dma->psc_regs->sicr, out_be32(&psc_dma->psc_regs->sicr,
psc_dma->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8); psc_dma->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8);
...@@ -321,66 +184,37 @@ static int __devinit psc_i2s_of_probe(struct of_device *op, ...@@ -321,66 +184,37 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
if (!of_get_property(op->node, "codec-handle", NULL)) if (!of_get_property(op->node, "codec-handle", NULL))
return 0; return 0;
/* Set up mode register; /* Due to errata in the dma mode; need to line up enabling
* First write: RxRdy (FIFO Alarm) generates rx FIFO irq * the transmitter with a transition on the frame sync
* Second write: register Normal mode for non loopback * line */
*/
out_8(&psc_dma->psc_regs->mode, 0); /* first make sure it is low */
out_8(&psc_dma->psc_regs->mode, 0); while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) != 0)
;
/* Set the TX and RX fifo alarm thresholds */ /* then wait for the transition to high */
out_be16(&psc_dma->fifo_regs->rfalarm, 0x100); while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) == 0)
out_8(&psc_dma->fifo_regs->rfcntl, 0x4); ;
out_be16(&psc_dma->fifo_regs->tfalarm, 0x100); /* Finally, enable the PSC.
out_8(&psc_dma->fifo_regs->tfcntl, 0x7); * Receiver must always be enabled; even when we only want
* transmit. (see 15.3.2.3 of MPC5200B User's Guide) */
/* Lookup the IRQ numbers */
psc_dma->playback.irq = /* Go */
bcom_get_task_irq(psc_dma->playback.bcom_task); out_8(&psc_dma->psc_regs->command,
psc_dma->capture.irq = MPC52xx_PSC_TX_ENABLE | MPC52xx_PSC_RX_ENABLE);
bcom_get_task_irq(psc_dma->capture.bcom_task);
/* Save what we've done so it can be found again later */
dev_set_drvdata(&op->dev, psc_dma);
/* Register the SYSFS files */
rc = device_create_file(psc_dma->dev, &dev_attr_status);
rc |= device_create_file(psc_dma->dev, &dev_attr_capture_overrun);
rc |= device_create_file(psc_dma->dev, &dev_attr_playback_underrun);
if (rc)
dev_info(psc_dma->dev, "error creating sysfs files\n");
snd_soc_register_platform(&psc_dma_pcm_soc_platform);
/* Tell the ASoC OF helpers about it */
of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op->node,
&psc_dma->dai);
return 0; return 0;
} }
static int __devexit psc_i2s_of_remove(struct of_device *op) static int __devexit psc_i2s_of_remove(struct of_device *op)
{ {
struct psc_dma *psc_dma = dev_get_drvdata(&op->dev); return mpc5200_audio_dma_destroy(op);
dev_dbg(&op->dev, "psc_i2s_remove()\n");
snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);
bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
iounmap(psc_dma->psc_regs);
iounmap(psc_dma->fifo_regs);
kfree(psc_dma);
dev_set_drvdata(&op->dev, NULL);
return 0;
} }
/* Match table for of_platform binding */ /* Match table for of_platform binding */
static struct of_device_id psc_i2s_match[] __devinitdata = { static struct of_device_id psc_i2s_match[] __devinitdata = {
{ .compatible = "fsl,mpc5200-psc-i2s", }, { .compatible = "fsl,mpc5200-psc-i2s", },
{ .compatible = "fsl,mpc5200b-psc-i2s", },
{} {}
}; };
MODULE_DEVICE_TABLE(of, psc_i2s_match); MODULE_DEVICE_TABLE(of, psc_i2s_match);
...@@ -411,4 +245,7 @@ static void __exit psc_i2s_exit(void) ...@@ -411,4 +245,7 @@ static void __exit psc_i2s_exit(void)
} }
module_exit(psc_i2s_exit); module_exit(psc_i2s_exit);
MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
MODULE_DESCRIPTION("Freescale MPC5200 PSC in I2S mode ASoC Driver");
MODULE_LICENSE("GPL");
sound/soc/fsl/mpc5200_psc_i2s.h 0 → 100644
View file @ dbcc3475
/*
* Freescale MPC5200 PSC in I2S mode
* ALSA SoC Digital Audio Interface (DAI) driver
*
*/
#ifndef __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__
#define __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__
extern struct snd_soc_dai psc_i2s_dai[];
#endif /* __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7