Skip to content

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

ASoC: Rename the PSC functions to DMA 

Rename the functions in the mpc5200 DMA file from i2s based names to dma
ones to reflect the file they are in.
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 89dd0842
Show whitespace changes
Inline Side-by-side
Showing with 190 additions and 190 deletions
sound/soc/fsl/mpc5200_dma.c
View file @ cebe7767
...@@ -34,21 +34,21 @@ MODULE_LICENSE("GPL"); ...@@ -34,21 +34,21 @@ MODULE_LICENSE("GPL");
/* /*
* Interrupt handlers * Interrupt handlers
*/ */
static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s) static irqreturn_t psc_dma_status_irq(int irq, void *_psc_dma)
{ {
struct psc_i2s *psc_i2s = _psc_i2s; struct psc_dma *psc_dma = _psc_dma;
struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs;
u16 isr; u16 isr;
isr = in_be16(&regs->mpc52xx_psc_isr); isr = in_be16(&regs->mpc52xx_psc_isr);
/* Playback underrun error */ /* Playback underrun error */
if (psc_i2s->playback.active && (isr & MPC52xx_PSC_IMR_TXEMP)) if (psc_dma->playback.active && (isr & MPC52xx_PSC_IMR_TXEMP))
psc_i2s->stats.underrun_count++; psc_dma->stats.underrun_count++;
/* Capture overrun error */ /* Capture overrun error */
if (psc_i2s->capture.active && (isr & MPC52xx_PSC_IMR_ORERR)) if (psc_dma->capture.active && (isr & MPC52xx_PSC_IMR_ORERR))
psc_i2s->stats.overrun_count++; psc_dma->stats.overrun_count++;
out_8(&regs->command, 4 << 4); /* reset the error status */ out_8(&regs->command, 4 << 4); /* reset the error status */
...@@ -56,7 +56,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s) ...@@ -56,7 +56,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s)
} }
/** /**
* psc_i2s_bcom_enqueue_next_buffer - Enqueue another audio buffer * psc_dma_bcom_enqueue_next_buffer - Enqueue another audio buffer
* @s: pointer to stream private data structure * @s: pointer to stream private data structure
* *
* Enqueues another audio period buffer into the bestcomm queue. * Enqueues another audio period buffer into the bestcomm queue.
...@@ -65,7 +65,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s) ...@@ -65,7 +65,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s)
* the queue. Otherwise the enqueue will fail and the audio ring buffer * the queue. Otherwise the enqueue will fail and the audio ring buffer
* will get out of sync * will get out of sync
*/ */
static void psc_i2s_bcom_enqueue_next_buffer(struct psc_i2s_stream *s) static void psc_dma_bcom_enqueue_next_buffer(struct psc_dma_stream *s)
{ {
struct bcom_bd *bd; struct bcom_bd *bd;
...@@ -82,9 +82,9 @@ static void psc_i2s_bcom_enqueue_next_buffer(struct psc_i2s_stream *s) ...@@ -82,9 +82,9 @@ static void psc_i2s_bcom_enqueue_next_buffer(struct psc_i2s_stream *s)
} }
/* Bestcomm DMA irq handler */ /* Bestcomm DMA irq handler */
static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream) static irqreturn_t psc_dma_bcom_irq(int irq, void *_psc_dma_stream)
{ {
struct psc_i2s_stream *s = _psc_i2s_stream; struct psc_dma_stream *s = _psc_dma_stream;
/* 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. */
...@@ -93,7 +93,7 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream) ...@@ -93,7 +93,7 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream)
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_i2s_bcom_enqueue_next_buffer(s); psc_dma_bcom_enqueue_next_buffer(s);
bcom_enable(s->bcom_task); bcom_enable(s->bcom_task);
} }
...@@ -106,39 +106,39 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream) ...@@ -106,39 +106,39 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream)
} }
/** /**
* psc_i2s_startup: create a new substream * psc_dma_startup: create a new substream
* *
* This is the first function called when a stream is opened. * 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 * If this is the first stream open, then grab the IRQ and program most of
* the PSC registers. * the PSC registers.
*/ */
int psc_i2s_startup(struct snd_pcm_substream *substream, int psc_dma_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) 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_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
int rc; int rc;
dev_dbg(psc_i2s->dev, "psc_i2s_startup(substream=%p)\n", substream); dev_dbg(psc_dma->dev, "psc_dma_startup(substream=%p)\n", substream);
if (!psc_i2s->playback.active && if (!psc_dma->playback.active &&
!psc_i2s->capture.active) { !psc_dma->capture.active) {
/* Setup the IRQs */ /* Setup the IRQs */
rc = request_irq(psc_i2s->irq, &psc_i2s_status_irq, IRQF_SHARED, rc = request_irq(psc_dma->irq, &psc_dma_status_irq, IRQF_SHARED,
"psc-i2s-status", psc_i2s); "psc-dma-status", psc_dma);
rc |= request_irq(psc_i2s->capture.irq, rc |= request_irq(psc_dma->capture.irq,
&psc_i2s_bcom_irq, IRQF_SHARED, &psc_dma_bcom_irq, IRQF_SHARED,
"psc-i2s-capture", &psc_i2s->capture); "psc-dma-capture", &psc_dma->capture);
rc |= request_irq(psc_i2s->playback.irq, rc |= request_irq(psc_dma->playback.irq,
&psc_i2s_bcom_irq, IRQF_SHARED, &psc_dma_bcom_irq, IRQF_SHARED,
"psc-i2s-playback", &psc_i2s->playback); "psc-dma-playback", &psc_dma->playback);
if (rc) { if (rc) {
free_irq(psc_i2s->irq, psc_i2s); free_irq(psc_dma->irq, psc_dma);
free_irq(psc_i2s->capture.irq, free_irq(psc_dma->capture.irq,
&psc_i2s->capture); &psc_dma->capture);
free_irq(psc_i2s->playback.irq, free_irq(psc_dma->playback.irq,
&psc_i2s->playback); &psc_dma->playback);
return -ENODEV; return -ENODEV;
} }
} }
...@@ -146,7 +146,7 @@ int psc_i2s_startup(struct snd_pcm_substream *substream, ...@@ -146,7 +146,7 @@ int psc_i2s_startup(struct snd_pcm_substream *substream,
return 0; return 0;
} }
int psc_i2s_hw_free(struct snd_pcm_substream *substream, int psc_dma_hw_free(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
snd_pcm_set_runtime_buffer(substream, NULL); snd_pcm_set_runtime_buffer(substream, NULL);
...@@ -154,29 +154,29 @@ int psc_i2s_hw_free(struct snd_pcm_substream *substream, ...@@ -154,29 +154,29 @@ int psc_i2s_hw_free(struct snd_pcm_substream *substream,
} }
/** /**
* psc_i2s_trigger: start and stop the DMA transfer. * psc_dma_trigger: start and stop the DMA transfer.
* *
* 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_i2s_trigger(struct snd_pcm_substream *substream, int cmd, int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *dai) 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_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct psc_i2s_stream *s; struct psc_dma_stream *s;
struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs; struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs;
u16 imr; u16 imr;
u8 psc_cmd; u8 psc_cmd;
unsigned long flags; unsigned long flags;
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
s = &psc_i2s->capture; s = &psc_dma->capture;
else else
s = &psc_i2s->playback; s = &psc_dma->playback;
dev_dbg(psc_i2s->dev, "psc_i2s_trigger(substream=%p, cmd=%i)" dev_dbg(psc_dma->dev, "psc_dma_trigger(substream=%p, cmd=%i)"
" stream_id=%i\n", " stream_id=%i\n",
substream, cmd, substream->pstr->stream); substream, cmd, substream->pstr->stream);
...@@ -207,14 +207,14 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -207,14 +207,14 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
else else
bcom_gen_bd_tx_reset(s->bcom_task); bcom_gen_bd_tx_reset(s->bcom_task);
while (!bcom_queue_full(s->bcom_task)) while (!bcom_queue_full(s->bcom_task))
psc_i2s_bcom_enqueue_next_buffer(s); psc_dma_bcom_enqueue_next_buffer(s);
bcom_enable(s->bcom_task); bcom_enable(s->bcom_task);
/* Due to errata in the i2s mode; need to line up enabling /* Due to errata in the dma mode; need to line up enabling
* the transmitter with a transition on the frame sync * the transmitter with a transition on the frame sync
* line */ * line */
spin_lock_irqsave(&psc_i2s->lock, flags); spin_lock_irqsave(&psc_dma->lock, flags);
/* first make sure it is low */ /* first make sure it is low */
while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) != 0) while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) != 0)
; ;
...@@ -228,7 +228,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -228,7 +228,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
if (substream->pstr->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->pstr->stream == SNDRV_PCM_STREAM_PLAYBACK)
psc_cmd |= MPC52xx_PSC_TX_ENABLE; psc_cmd |= MPC52xx_PSC_TX_ENABLE;
out_8(&regs->command, psc_cmd); out_8(&regs->command, psc_cmd);
spin_unlock_irqrestore(&psc_i2s->lock, flags); spin_unlock_irqrestore(&psc_dma->lock, flags);
break; break;
...@@ -236,7 +236,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -236,7 +236,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
/* Turn off the PSC */ /* Turn off the PSC */
s->active = 0; s->active = 0;
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) { if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) {
if (!psc_i2s->playback.active) { if (!psc_dma->playback.active) {
out_8(&regs->command, 2 << 4); /* reset rx */ out_8(&regs->command, 2 << 4); /* reset rx */
out_8(&regs->command, 3 << 4); /* reset tx */ out_8(&regs->command, 3 << 4); /* reset tx */
out_8(&regs->command, 4 << 4); /* reset err */ out_8(&regs->command, 4 << 4); /* reset err */
...@@ -244,7 +244,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -244,7 +244,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
} else { } else {
out_8(&regs->command, 3 << 4); /* reset tx */ out_8(&regs->command, 3 << 4); /* reset tx */
out_8(&regs->command, 4 << 4); /* reset err */ out_8(&regs->command, 4 << 4); /* reset err */
if (!psc_i2s->capture.active) if (!psc_dma->capture.active)
out_8(&regs->command, 2 << 4); /* reset rx */ out_8(&regs->command, 2 << 4); /* reset rx */
} }
...@@ -255,15 +255,15 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -255,15 +255,15 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
break; break;
default: default:
dev_dbg(psc_i2s->dev, "invalid command\n"); dev_dbg(psc_dma->dev, "invalid command\n");
return -EINVAL; return -EINVAL;
} }
/* Update interrupt enable settings */ /* Update interrupt enable settings */
imr = 0; imr = 0;
if (psc_i2s->playback.active) if (psc_dma->playback.active)
imr |= MPC52xx_PSC_IMR_TXEMP; imr |= MPC52xx_PSC_IMR_TXEMP;
if (psc_i2s->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, imr);
...@@ -271,36 +271,36 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -271,36 +271,36 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
} }
/** /**
* psc_i2s_shutdown: shutdown the data transfer on a stream * psc_dma_shutdown: shutdown the data transfer on a stream
* *
* Shutdown the PSC if there are no other substreams open. * Shutdown the PSC if there are no other substreams open.
*/ */
void psc_i2s_shutdown(struct snd_pcm_substream *substream, void psc_dma_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) 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_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
dev_dbg(psc_i2s->dev, "psc_i2s_shutdown(substream=%p)\n", substream); dev_dbg(psc_dma->dev, "psc_dma_shutdown(substream=%p)\n", substream);
/* /*
* If this is the last active substream, disable the PSC and release * If this is the last active substream, disable the PSC and release
* the IRQ. * the IRQ.
*/ */
if (!psc_i2s->playback.active && if (!psc_dma->playback.active &&
!psc_i2s->capture.active) { !psc_dma->capture.active) {
/* Disable all interrupts and reset the PSC */ /* Disable all interrupts and reset the PSC */
out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0); out_be16(&psc_dma->psc_regs->isr_imr.imr, 0);
out_8(&psc_i2s->psc_regs->command, 3 << 4); /* reset tx */ out_8(&psc_dma->psc_regs->command, 3 << 4); /* reset tx */
out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset rx */ out_8(&psc_dma->psc_regs->command, 2 << 4); /* reset rx */
out_8(&psc_i2s->psc_regs->command, 1 << 4); /* reset mode */ out_8(&psc_dma->psc_regs->command, 1 << 4); /* reset mode */
out_8(&psc_i2s->psc_regs->command, 4 << 4); /* reset error */ out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error */
/* Release irqs */ /* Release irqs */
free_irq(psc_i2s->irq, psc_i2s); free_irq(psc_dma->irq, psc_dma);
free_irq(psc_i2s->capture.irq, &psc_i2s->capture); free_irq(psc_dma->capture.irq, &psc_dma->capture);
free_irq(psc_i2s->playback.irq, &psc_i2s->playback); free_irq(psc_dma->playback.irq, &psc_dma->playback);
} }
} }
...@@ -312,7 +312,7 @@ void psc_i2s_shutdown(struct snd_pcm_substream *substream, ...@@ -312,7 +312,7 @@ void psc_i2s_shutdown(struct snd_pcm_substream *substream,
* interaction with the attached codec * interaction with the attached codec
*/ */
static const struct snd_pcm_hardware psc_i2s_pcm_hardware = { static const struct snd_pcm_hardware psc_dma_pcm_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,
...@@ -330,80 +330,80 @@ static const struct snd_pcm_hardware psc_i2s_pcm_hardware = { ...@@ -330,80 +330,80 @@ static const struct snd_pcm_hardware psc_i2s_pcm_hardware = {
.fifo_size = 0, .fifo_size = 0,
}; };
static int psc_i2s_pcm_open(struct snd_pcm_substream *substream) static int psc_dma_pcm_open(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_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
struct psc_i2s_stream *s; struct psc_dma_stream *s;
dev_dbg(psc_i2s->dev, "psc_i2s_pcm_open(substream=%p)\n", substream); dev_dbg(psc_dma->dev, "psc_dma_pcm_open(substream=%p)\n", substream);
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
s = &psc_i2s->capture; s = &psc_dma->capture;
else else
s = &psc_i2s->playback; s = &psc_dma->playback;
snd_soc_set_runtime_hwparams(substream, &psc_i2s_pcm_hardware); snd_soc_set_runtime_hwparams(substream, &psc_dma_pcm_hardware);
s->stream = substream; s->stream = substream;
return 0; return 0;
} }
static int psc_i2s_pcm_close(struct snd_pcm_substream *substream) static int psc_dma_pcm_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_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
struct psc_i2s_stream *s; struct psc_dma_stream *s;
dev_dbg(psc_i2s->dev, "psc_i2s_pcm_close(substream=%p)\n", substream); dev_dbg(psc_dma->dev, "psc_dma_pcm_close(substream=%p)\n", substream);
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
s = &psc_i2s->capture; s = &psc_dma->capture;
else else
s = &psc_i2s->playback; s = &psc_dma->playback;
s->stream = NULL; s->stream = NULL;
return 0; return 0;
} }
static snd_pcm_uframes_t static snd_pcm_uframes_t
psc_i2s_pcm_pointer(struct snd_pcm_substream *substream) psc_dma_pcm_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_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
struct psc_i2s_stream *s; struct psc_dma_stream *s;
dma_addr_t count; dma_addr_t count;
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
s = &psc_i2s->capture; s = &psc_dma->capture;
else else
s = &psc_i2s->playback; s = &psc_dma->playback;
count = s->period_current_pt - s->period_start; count = s->period_current_pt - s->period_start;
return bytes_to_frames(substream->runtime, count); return bytes_to_frames(substream->runtime, count);
} }
static struct snd_pcm_ops psc_i2s_pcm_ops = { static struct snd_pcm_ops psc_dma_pcm_ops = {
.open = psc_i2s_pcm_open, .open = psc_dma_pcm_open,
.close = psc_i2s_pcm_close, .close = psc_dma_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.pointer = psc_i2s_pcm_pointer, .pointer = psc_dma_pcm_pointer,
}; };
static u64 psc_i2s_pcm_dmamask = 0xffffffff; static u64 psc_dma_pcm_dmamask = 0xffffffff;
static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, static int psc_dma_pcm_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_i2s_pcm_hardware.buffer_bytes_max; size_t size = psc_dma_pcm_hardware.buffer_bytes_max;
int rc = 0; int rc = 0;
dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_new(card=%p, dai=%p, pcm=%p)\n", dev_dbg(rtd->socdev->dev, "psc_dma_pcm_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_i2s_pcm_dmamask; card->dev->dma_mask = &psc_dma_pcm_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;
...@@ -431,13 +431,13 @@ static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, ...@@ -431,13 +431,13 @@ static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
return -ENOMEM; return -ENOMEM;
} }
static void psc_i2s_pcm_free(struct snd_pcm *pcm) static void psc_dma_pcm_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_i2s_pcm_free(pcm=%p)\n", pcm); dev_dbg(rtd->socdev->dev, "psc_dma_pcm_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 +449,10 @@ static void psc_i2s_pcm_free(struct snd_pcm *pcm) ...@@ -449,10 +449,10 @@ static void psc_i2s_pcm_free(struct snd_pcm *pcm)
} }
} }
struct snd_soc_platform psc_i2s_pcm_soc_platform = { struct snd_soc_platform psc_dma_pcm_soc_platform = {
.name = "mpc5200-psc-audio", .name = "mpc5200-psc-audio",
.pcm_ops = &psc_i2s_pcm_ops, .pcm_ops = &psc_dma_pcm_ops,
.pcm_new = &psc_i2s_pcm_new, .pcm_new = &psc_dma_pcm_new,
.pcm_free = &psc_i2s_pcm_free, .pcm_free = &psc_dma_pcm_free,
}; };
sound/soc/fsl/mpc5200_dma.h
View file @ cebe7767
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#define __SOUND_SOC_FSL_MPC5200_DMA_H__ #define __SOUND_SOC_FSL_MPC5200_DMA_H__
/** /**
* psc_i2s_stream - Data specific to a single stream (playback or capture) * psc_dma_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_i2s: pointer back to parent psc_i2s data structure * @psc_dma: pointer back to parent psc_dma data structure
* @bcom_task: bestcomm task structure * @bcom_task: bestcomm task structure
* @irq: irq number for bestcomm task * @irq: irq number for bestcomm task
* @period_start: physical address of start of DMA region * @period_start: physical address of start of DMA region
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* @period_next_pt: physical address of next DMA buffer to enqueue * @period_next_pt: physical address of next DMA buffer to enqueue
* @period_bytes: size of DMA period in bytes * @period_bytes: size of DMA period in bytes
*/ */
struct psc_i2s_stream { struct psc_dma_stream {
int active; int active;
struct psc_i2s *psc_i2s; struct psc_dma *psc_dma;
struct bcom_task *bcom_task; struct bcom_task *bcom_task;
int irq; int irq;
struct snd_pcm_substream *stream; struct snd_pcm_substream *stream;
...@@ -30,7 +30,7 @@ struct psc_i2s_stream { ...@@ -30,7 +30,7 @@ struct psc_i2s_stream {
}; };
/** /**
* psc_i2s - Private driver data * psc_dma - Private driver data
* @name: short name for this device ("PSC0", "PSC1", etc) * @name: short name for this device ("PSC0", "PSC1", etc)
* @psc_regs: pointer to the PSC's registers * @psc_regs: pointer to the PSC's registers
* @fifo_regs: pointer to the PSC's FIFO registers * @fifo_regs: pointer to the PSC's FIFO registers
...@@ -42,7 +42,7 @@ struct psc_i2s_stream { ...@@ -42,7 +42,7 @@ struct psc_i2s_stream {
* @playback: Playback stream context data * @playback: Playback stream context data
* @capture: Capture stream context data * @capture: Capture stream context data
*/ */
struct psc_i2s { struct psc_dma {
char name[32]; char name[32];
struct mpc52xx_psc __iomem *psc_regs; struct mpc52xx_psc __iomem *psc_regs;
struct mpc52xx_psc_fifo __iomem *fifo_regs; struct mpc52xx_psc_fifo __iomem *fifo_regs;
...@@ -53,8 +53,8 @@ struct psc_i2s { ...@@ -53,8 +53,8 @@ struct psc_i2s {
u32 sicr; u32 sicr;
/* per-stream data */ /* per-stream data */
struct psc_i2s_stream playback; struct psc_dma_stream playback;
struct psc_i2s_stream capture; struct psc_dma_stream capture;
/* Statistics */ /* Statistics */
struct { struct {
...@@ -64,18 +64,18 @@ struct psc_i2s { ...@@ -64,18 +64,18 @@ struct psc_i2s {
}; };
int psc_i2s_startup(struct snd_pcm_substream *substream, int psc_dma_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
int psc_i2s_hw_free(struct snd_pcm_substream *substream, int psc_dma_hw_free(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
void psc_i2s_shutdown(struct snd_pcm_substream *substream, void psc_dma_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
extern struct snd_soc_platform psc_i2s_pcm_soc_platform; 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 @ cebe7767
...@@ -54,10 +54,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -54,10 +54,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) 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_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
u32 mode; u32 mode;
dev_dbg(psc_i2s->dev, "%s(substream=%p) p_size=%i p_bytes=%i" dev_dbg(psc_dma->dev, "%s(substream=%p) p_size=%i p_bytes=%i"
" periods=%i buffer_size=%i buffer_bytes=%i\n", " periods=%i buffer_size=%i buffer_bytes=%i\n",
__func__, substream, params_period_size(params), __func__, substream, params_period_size(params),
params_period_bytes(params), params_periods(params), params_period_bytes(params), params_periods(params),
...@@ -77,10 +77,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -77,10 +77,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream,
mode = MPC52xx_PSC_SICR_SIM_CODEC_32; mode = MPC52xx_PSC_SICR_SIM_CODEC_32;
break; break;
default: default:
dev_dbg(psc_i2s->dev, "invalid format\n"); dev_dbg(psc_dma->dev, "invalid format\n");
return -EINVAL; return -EINVAL;
} }
out_be32(&psc_i2s->psc_regs->sicr, psc_i2s->sicr | mode); out_be32(&psc_dma->psc_regs->sicr, psc_dma->sicr | mode);
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
...@@ -104,8 +104,8 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -104,8 +104,8 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream,
static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct psc_i2s *psc_i2s = cpu_dai->private_data; struct psc_dma *psc_dma = cpu_dai->private_data;
dev_dbg(psc_i2s->dev, "psc_i2s_set_sysclk(cpu_dai=%p, dir=%i)\n", dev_dbg(psc_dma->dev, "psc_i2s_set_sysclk(cpu_dai=%p, dir=%i)\n",
cpu_dai, dir); cpu_dai, dir);
return (dir == SND_SOC_CLOCK_IN) ? 0 : -EINVAL; return (dir == SND_SOC_CLOCK_IN) ? 0 : -EINVAL;
} }
...@@ -123,8 +123,8 @@ static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, ...@@ -123,8 +123,8 @@ static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
*/ */
static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format) static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
{ {
struct psc_i2s *psc_i2s = cpu_dai->private_data; struct psc_dma *psc_dma = cpu_dai->private_data;
dev_dbg(psc_i2s->dev, "psc_i2s_set_fmt(cpu_dai=%p, format=%i)\n", dev_dbg(psc_dma->dev, "psc_i2s_set_fmt(cpu_dai=%p, format=%i)\n",
cpu_dai, format); cpu_dai, format);
return (format == SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL; return (format == SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL;
} }
...@@ -140,11 +140,11 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format) ...@@ -140,11 +140,11 @@ 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_i2s_startup, .startup = psc_dma_startup,
.hw_params = psc_i2s_hw_params, .hw_params = psc_i2s_hw_params,
.hw_free = psc_i2s_hw_free, .hw_free = psc_dma_hw_free,
.shutdown = psc_i2s_shutdown, .shutdown = psc_dma_shutdown,
.trigger = psc_i2s_trigger, .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,
}; };
...@@ -172,24 +172,24 @@ static struct snd_soc_dai psc_i2s_dai_template = { ...@@ -172,24 +172,24 @@ static struct snd_soc_dai psc_i2s_dai_template = {
static ssize_t psc_i2s_status_show(struct device *dev, static ssize_t psc_i2s_status_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct psc_i2s *psc_i2s = dev_get_drvdata(dev); struct psc_dma *psc_dma = dev_get_drvdata(dev);
return sprintf(buf, "status=%.4x sicr=%.8x rfnum=%i rfstat=0x%.4x " return sprintf(buf, "status=%.4x sicr=%.8x rfnum=%i rfstat=0x%.4x "
"tfnum=%i tfstat=0x%.4x\n", "tfnum=%i tfstat=0x%.4x\n",
in_be16(&psc_i2s->psc_regs->sr_csr.status), in_be16(&psc_dma->psc_regs->sr_csr.status),
in_be32(&psc_i2s->psc_regs->sicr), in_be32(&psc_dma->psc_regs->sicr),
in_be16(&psc_i2s->fifo_regs->rfnum) & 0x1ff, in_be16(&psc_dma->fifo_regs->rfnum) & 0x1ff,
in_be16(&psc_i2s->fifo_regs->rfstat), in_be16(&psc_dma->fifo_regs->rfstat),
in_be16(&psc_i2s->fifo_regs->tfnum) & 0x1ff, in_be16(&psc_dma->fifo_regs->tfnum) & 0x1ff,
in_be16(&psc_i2s->fifo_regs->tfstat)); in_be16(&psc_dma->fifo_regs->tfstat));
} }
static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *name) static int *psc_i2s_get_stat_attr(struct psc_dma *psc_dma, const char *name)
{ {
if (strcmp(name, "playback_underrun") == 0) if (strcmp(name, "playback_underrun") == 0)
return &psc_i2s->stats.underrun_count; return &psc_dma->stats.underrun_count;
if (strcmp(name, "capture_overrun") == 0) if (strcmp(name, "capture_overrun") == 0)
return &psc_i2s->stats.overrun_count; return &psc_dma->stats.overrun_count;
return NULL; return NULL;
} }
...@@ -197,10 +197,10 @@ static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *name) ...@@ -197,10 +197,10 @@ static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *name)
static ssize_t psc_i2s_stat_show(struct device *dev, static ssize_t psc_i2s_stat_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct psc_i2s *psc_i2s = dev_get_drvdata(dev); struct psc_dma *psc_dma = dev_get_drvdata(dev);
int *attrib; int *attrib;
attrib = psc_i2s_get_stat_attr(psc_i2s, attr->attr.name); attrib = psc_i2s_get_stat_attr(psc_dma, attr->attr.name);
if (!attrib) if (!attrib)
return 0; return 0;
...@@ -212,10 +212,10 @@ static ssize_t psc_i2s_stat_store(struct device *dev, ...@@ -212,10 +212,10 @@ static ssize_t psc_i2s_stat_store(struct device *dev,
const char *buf, const char *buf,
size_t count) size_t count)
{ {
struct psc_i2s *psc_i2s = dev_get_drvdata(dev); struct psc_dma *psc_dma = dev_get_drvdata(dev);
int *attrib; int *attrib;
attrib = psc_i2s_get_stat_attr(psc_i2s, attr->attr.name); attrib = psc_i2s_get_stat_attr(psc_dma, attr->attr.name);
if (!attrib) if (!attrib)
return 0; return 0;
...@@ -238,7 +238,7 @@ static int __devinit psc_i2s_of_probe(struct of_device *op, ...@@ -238,7 +238,7 @@ 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; phys_addr_t fifo;
struct psc_i2s *psc_i2s; struct psc_dma *psc_dma;
struct resource res; struct resource res;
int size, psc_id, irq, rc; int size, psc_id, irq, rc;
const __be32 *prop; const __be32 *prop;
...@@ -265,56 +265,56 @@ static int __devinit psc_i2s_of_probe(struct of_device *op, ...@@ -265,56 +265,56 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
} }
/* Allocate and initialize the driver private data */ /* Allocate and initialize the driver private data */
psc_i2s = kzalloc(sizeof *psc_i2s, GFP_KERNEL); psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL);
if (!psc_i2s) { if (!psc_dma) {
iounmap(regs); iounmap(regs);
return -ENOMEM; return -ENOMEM;
} }
spin_lock_init(&psc_i2s->lock); spin_lock_init(&psc_dma->lock);
psc_i2s->irq = irq; psc_dma->irq = irq;
psc_i2s->psc_regs = regs; psc_dma->psc_regs = regs;
psc_i2s->fifo_regs = regs + sizeof *psc_i2s->psc_regs; psc_dma->fifo_regs = regs + sizeof *psc_dma->psc_regs;
psc_i2s->dev = &op->dev; psc_dma->dev = &op->dev;
psc_i2s->playback.psc_i2s = psc_i2s; psc_dma->playback.psc_dma = psc_dma;
psc_i2s->capture.psc_i2s = psc_i2s; psc_dma->capture.psc_dma = psc_dma;
snprintf(psc_i2s->name, sizeof psc_i2s->name, "PSC%u", psc_id+1); snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc_id+1);
/* Fill out the CPU DAI structure */ /* Fill out the CPU DAI structure */
memcpy(&psc_i2s->dai, &psc_i2s_dai_template, sizeof psc_i2s->dai); memcpy(&psc_dma->dai, &psc_i2s_dai_template, sizeof psc_dma->dai);
psc_i2s->dai.private_data = psc_i2s; psc_dma->dai.private_data = psc_dma;
psc_i2s->dai.name = psc_i2s->name; psc_dma->dai.name = psc_dma->name;
psc_i2s->dai.id = psc_id; psc_dma->dai.id = psc_id;
/* Find the address of the fifo data registers and setup the /* Find the address of the fifo data registers and setup the
* DMA tasks */ * DMA tasks */
fifo = res.start + offsetof(struct mpc52xx_psc, buffer.buffer_32); fifo = res.start + offsetof(struct mpc52xx_psc, buffer.buffer_32);
psc_i2s->capture.bcom_task = psc_dma->capture.bcom_task =
bcom_psc_gen_bd_rx_init(psc_id, 10, fifo, 512); bcom_psc_gen_bd_rx_init(psc_id, 10, fifo, 512);
psc_i2s->playback.bcom_task = psc_dma->playback.bcom_task =
bcom_psc_gen_bd_tx_init(psc_id, 10, fifo); bcom_psc_gen_bd_tx_init(psc_id, 10, fifo);
if (!psc_i2s->capture.bcom_task || if (!psc_dma->capture.bcom_task ||
!psc_i2s->playback.bcom_task) { !psc_dma->playback.bcom_task) {
dev_err(&op->dev, "Could not allocate bestcomm tasks\n"); dev_err(&op->dev, "Could not allocate bestcomm tasks\n");
iounmap(regs); iounmap(regs);
kfree(psc_i2s); kfree(psc_dma);
return -ENODEV; return -ENODEV;
} }
/* Disable all interrupts and reset the PSC */ /* Disable all interrupts and reset the PSC */
out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0); out_be16(&psc_dma->psc_regs->isr_imr.imr, 0);
out_8(&psc_i2s->psc_regs->command, 3 << 4); /* reset transmitter */ out_8(&psc_dma->psc_regs->command, 3 << 4); /* reset transmitter */
out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset receiver */ out_8(&psc_dma->psc_regs->command, 2 << 4); /* reset receiver */
out_8(&psc_i2s->psc_regs->command, 1 << 4); /* reset mode */ out_8(&psc_dma->psc_regs->command, 1 << 4); /* reset mode */
out_8(&psc_i2s->psc_regs->command, 4 << 4); /* reset error */ 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_i2s->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)) if (of_get_property(op->node, "fsl,cellslave", NULL))
psc_i2s->sicr |= MPC52xx_PSC_SICR_CELLSLAVE | psc_dma->sicr |= MPC52xx_PSC_SICR_CELLSLAVE |
MPC52xx_PSC_SICR_GENCLK; MPC52xx_PSC_SICR_GENCLK;
out_be32(&psc_i2s->psc_regs->sicr, out_be32(&psc_dma->psc_regs->sicr,
psc_i2s->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8); psc_dma->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8);
/* Check for the codec handle. If it is not present then we /* Check for the codec handle. If it is not present then we
* are done */ * are done */
...@@ -325,54 +325,54 @@ static int __devinit psc_i2s_of_probe(struct of_device *op, ...@@ -325,54 +325,54 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
* First write: RxRdy (FIFO Alarm) generates rx FIFO irq * First write: RxRdy (FIFO Alarm) generates rx FIFO irq
* Second write: register Normal mode for non loopback * Second write: register Normal mode for non loopback
*/ */
out_8(&psc_i2s->psc_regs->mode, 0); out_8(&psc_dma->psc_regs->mode, 0);
out_8(&psc_i2s->psc_regs->mode, 0); out_8(&psc_dma->psc_regs->mode, 0);
/* Set the TX and RX fifo alarm thresholds */ /* Set the TX and RX fifo alarm thresholds */
out_be16(&psc_i2s->fifo_regs->rfalarm, 0x100); out_be16(&psc_dma->fifo_regs->rfalarm, 0x100);
out_8(&psc_i2s->fifo_regs->rfcntl, 0x4); out_8(&psc_dma->fifo_regs->rfcntl, 0x4);
out_be16(&psc_i2s->fifo_regs->tfalarm, 0x100); out_be16(&psc_dma->fifo_regs->tfalarm, 0x100);
out_8(&psc_i2s->fifo_regs->tfcntl, 0x7); out_8(&psc_dma->fifo_regs->tfcntl, 0x7);
/* Lookup the IRQ numbers */ /* Lookup the IRQ numbers */
psc_i2s->playback.irq = psc_dma->playback.irq =
bcom_get_task_irq(psc_i2s->playback.bcom_task); bcom_get_task_irq(psc_dma->playback.bcom_task);
psc_i2s->capture.irq = psc_dma->capture.irq =
bcom_get_task_irq(psc_i2s->capture.bcom_task); bcom_get_task_irq(psc_dma->capture.bcom_task);
/* Save what we've done so it can be found again later */ /* Save what we've done so it can be found again later */
dev_set_drvdata(&op->dev, psc_i2s); dev_set_drvdata(&op->dev, psc_dma);
/* Register the SYSFS files */ /* Register the SYSFS files */
rc = device_create_file(psc_i2s->dev, &dev_attr_status); rc = device_create_file(psc_dma->dev, &dev_attr_status);
rc |= device_create_file(psc_i2s->dev, &dev_attr_capture_overrun); rc |= device_create_file(psc_dma->dev, &dev_attr_capture_overrun);
rc |= device_create_file(psc_i2s->dev, &dev_attr_playback_underrun); rc |= device_create_file(psc_dma->dev, &dev_attr_playback_underrun);
if (rc) if (rc)
dev_info(psc_i2s->dev, "error creating sysfs files\n"); dev_info(psc_dma->dev, "error creating sysfs files\n");
snd_soc_register_platform(&psc_i2s_pcm_soc_platform); snd_soc_register_platform(&psc_dma_pcm_soc_platform);
/* Tell the ASoC OF helpers about it */ /* Tell the ASoC OF helpers about it */
of_snd_soc_register_platform(&psc_i2s_pcm_soc_platform, op->node, of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op->node,
&psc_i2s->dai); &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_i2s *psc_i2s = dev_get_drvdata(&op->dev); struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
dev_dbg(&op->dev, "psc_i2s_remove()\n"); dev_dbg(&op->dev, "psc_i2s_remove()\n");
snd_soc_unregister_platform(&psc_i2s_pcm_soc_platform); snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);
bcom_gen_bd_rx_release(psc_i2s->capture.bcom_task); bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
bcom_gen_bd_tx_release(psc_i2s->playback.bcom_task); bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
iounmap(psc_i2s->psc_regs); iounmap(psc_dma->psc_regs);
iounmap(psc_i2s->fifo_regs); iounmap(psc_dma->fifo_regs);
kfree(psc_i2s); kfree(psc_dma);
dev_set_drvdata(&op->dev, NULL); dev_set_drvdata(&op->dev, NULL);
return 0; return 0;
......
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