Skip to contentSkip to conversation

Split the DMA core out from mpc5200_psc_i2s.c

PATCH In review Jon Smirl 2 participants 10 messages Apr 26, 2009 – Apr 27, 2009

Subsystems (2)
lore
Share & tools
lore

Jon Smirl

author
#0 lore raw

cover Split the DMA core out from mpc5200_psc_i2s.c

Patch series to separate out the mpc5200 core DMA routines from mpc5200_psc_i2s.c into a standalone mpc5200_dma.c. No intention to change how anything works, this is just a code reorg needed for later patches to build on.

---

Jon Smirl (3):
Rename exports in mpc5200_dma.c
Rename the PSC functions to DMA
Basic split of mpc5200 DMA code out from mpc5200_psc_i2s

 sound/soc/fsl/Kconfig           |    4
 sound/soc/fsl/Makefile          |    2
 sound/soc/fsl/mpc5200_dma.c     |  463 ++++++++++++++++++++++++++++
 sound/soc/fsl/mpc5200_dma.h     |   81 +++++
 sound/soc/fsl/mpc5200_psc_i2s.c |  644 +++++----------------------------------
 5 files changed, 632 insertions(+), 562 deletions(-)
 create mode 100644 sound/soc/fsl/mpc5200_dma.c
 create mode 100644 sound/soc/fsl/mpc5200_dma.h

--
Jon Smirl
[email protected]

author
#1 lore raw

PATCH 1/3 Basic split of mpc5200 DMA code out from mpc5200_psc_i2s

Basic split of mpc5200 DMA code out from i2s into a standalone file.

---
 sound/soc/fsl/Kconfig           |    4 
 sound/soc/fsl/Makefile          |    2 
 sound/soc/fsl/mpc5200_dma.c     |  457 +++++++++++++++++++++++++++++++++++++
 sound/soc/fsl/mpc5200_dma.h     |   81 +++++++
 sound/soc/fsl/mpc5200_psc_i2s.c |  484 ---------------------------------------
 5 files changed, 546 insertions(+), 482 deletions(-)
 create mode 100644 sound/soc/fsl/mpc5200_dma.c
 create mode 100644 sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/Kconfig +4 -0
index 9fc9082..dc79bdf 100644
@@ -1,5 +1,8 @@
 config SND_SOC_OF_SIMPLE
 	tristate
+	
+config SND_MPC52xx_DMA
+	tristate
 
 # ASoC platform support for the Freescale MPC8610 SOC.  This compiles drivers
 # for the SSI and the Elo DMA controller.  You will still need to select
@@ -23,6 +26,7 @@ config SND_SOC_MPC5200_I2S
 	tristate "Freescale MPC5200 PSC in I2S mode driver"
 	depends on PPC_MPC52xx && PPC_BESTCOMM
 	select SND_SOC_OF_SIMPLE
+	select SND_MPC52xx_DMA
 	select PPC_BESTCOMM_GEN_BD
 	help
 	  Say Y here to support the MPC5200 PSCs in I2S mode.
sound/soc/fsl/Makefile +2 -0
index f85134c..7731ef2 100644
@@ -10,5 +10,7 @@ snd-soc-fsl-ssi-objs := fsl_ssi.o
 snd-soc-fsl-dma-objs := fsl_dma.o
 obj-$(CONFIG_SND_SOC_MPC8610) += snd-soc-fsl-ssi.o snd-soc-fsl-dma.o
 
+# MPC5200 Platform Support
+obj-$(CONFIG_SND_MPC52xx_DMA) += mpc5200_dma.o
 obj-$(CONFIG_SND_SOC_MPC5200_I2S) += mpc5200_psc_i2s.o
 
sound/soc/fsl/mpc5200_dma.c new file +457 -0

457 lines not on this page · raw message

sound/soc/fsl/mpc5200_dma.h new file +81 -0

81 lines not on this page · raw message

sound/soc/fsl/mpc5200_psc_i2s.c +2 -482

508 lines not on this page · raw message

Acked-by on v1 1/3
#2 lore raw

Re: [PATCH V1 1/3] Basic split of mpc5200 DMA code out from mpc5200_psc_i2s

Quoted 3 lines · Jon Smirl

Basic split of mpc5200 DMA code out from i2s into a standalone file.

But you should really also send this to the ALSA list. I cannot merge this patch.

g.

Quoted 4 lines

---
=A0sound/soc/fsl/Kconfig =A0 =A0 =A0 =A0 =A0 | =A0 =A04 =A0sound/soc/fsl/Makefile =A0 =A0 =A0 =A0 =A0| =A0 =A02 =A0sound/soc/fsl/mpc5200_dma.c =A0 =A0 | =A0457 +++++++++++++++++++++++++=

++++++++++++

Quoted 2 lines

=A0sound/soc/fsl/mpc5200_dma.h =A0 =A0 | =A0 81 +++++++ =A0sound/soc/fsl/mpc5200_psc_i2s.c | =A0484 -----------------------------=

----------

Quoted 15 lines

=A05 files changed, 546 insertions(+), 482 deletions(-) =A0create mode 100644 sound/soc/fsl/mpc5200_dma.c =A0create mode 100644 sound/soc/fsl/mpc5200_dma.h

sound/soc/fsl/Kconfig +0 -0
index 9fc9082..dc79bdf 100644
@@ -1,5 +1,8 @@

=A0config SND_SOC_OF_SIMPLE
=A0 =A0 =A0 =A0tristate

sound/soc/fsl/Kconfig +3 -0
+
+config SND_MPC52xx_DMA
+ =A0 =A0 =A0 tristate
Quoted 1 line

=A0# ASoC platform support for the Freescale MPC8610 SOC. =A0This compile=

s drivers

Quoted 1 line

=A0# for the SSI and the Elo DMA controller. =A0You will still need to se=

lect

Quoted 62 lines
sound/soc/fsl/Kconfig +0 -0
@@ -23,6 +26,7 @@ config SND_SOC_MPC5200_I2S

=A0 =A0 =A0 =A0tristate "Freescale MPC5200 PSC in I2S mode driver" =A0 =A0 =A0 =A0depends on PPC_MPC52xx && PPC_BESTCOMM
=A0 =A0 =A0 =A0select SND_SOC_OF_SIMPLE
+ =A0 =A0 =A0 select SND_MPC52xx_DMA
=A0 =A0 =A0 =A0select PPC_BESTCOMM_GEN_BD
=A0 =A0 =A0 =A0help
=A0 =A0 =A0 =A0 =A0Say Y here to support the MPC5200 PSCs in I2S mode.

sound/soc/fsl/Makefile +0 -0
index f85134c..7731ef2 100644
@@ -10,5 +10,7 @@ snd-soc-fsl-ssi-objs :=3D fsl_ssi.o

=A0snd-soc-fsl-dma-objs :=3D fsl_dma.o =A0obj-$(CONFIG_SND_SOC_MPC8610) +=3D snd-soc-fsl-ssi.o snd-soc-fsl-dma.o

sound/soc/fsl/Makefile +2 -0
+# MPC5200 Platform Support
+obj-$(CONFIG_SND_MPC52xx_DMA) +=3D mpc5200_dma.o

=A0obj-$(CONFIG_SND_SOC_MPC5200_I2S) +=3D mpc5200_psc_i2s.o

sound/soc/fsl/mpc5200_dma.c new file +36 -0
new file mode 100644
index 0000000..cccaff4
@@ -0,0 +1,457 @@
+/*
+ * Freescale MPC5200 PSC DMA
+ * ALSA SoC Platform driver
+ *
+ * Copyright (C) 2008 Secret Lab Technologies Ltd.
+ */
+
+#include <linux/init.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_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-of-simple.h>
+
+#include <sysdev/bestcomm/bestcomm.h>
+#include <sysdev/bestcomm/gen_bd.h>
+#include <asm/mpc52xx_psc.h>
+
+#include "mpc5200_dma.h"
+
+MODULE_AUTHOR("Grant Likely <[email protected]>");
+MODULE_DESCRIPTION("Freescale MPC5200 PSC in DMA mode ASoC Driver");
+MODULE_LICENSE("GPL");
+
+/*
+ * Interrupt handlers
+ */

sound/soc/fsl/mpc5200_dma.c line 46

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.c new file +10 -0
+static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s)
+{
+ =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D _psc_i2s;
+ =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
+ =A0 =A0 =A0 u16 isr;
+
+ =A0 =A0 =A0 isr =3D in_be16(&regs->mpc52xx_psc_isr);
+
+ =A0 =A0 =A0 /* Playback underrun error */
+ =A0 =A0 =A0 if (psc_i2s->playback.active && (isr & MPC52xx_PSC_IMR_TXEM=

P))

sound/soc/fsl/mpc5200_dma.c line 50

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.c new file +4 -0
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.underrun_count++;
+
+ =A0 =A0 =A0 /* Capture overrun error */
+ =A0 =A0 =A0 if (psc_i2s->capture.active && (isr & MPC52xx_PSC_IMR_ORERR=

))

sound/soc/fsl/mpc5200_dma.c line 53

Quoted 3 lines
sound/soc/fsl/mpc5200_dma.c new file +3 -0
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.overrun_count++;
+
+ =A0 =A0 =A0 out_8(&regs->command, 4 << 4); =A0/* reset the error status=

*/

sound/soc/fsl/mpc5200_dma.c

Quoted 11 lines
sound/soc/fsl/mpc5200_dma.c new file +11 -0
+
+ =A0 =A0 =A0 return IRQ_HANDLED;
+}
+
+/**
+ * psc_i2s_bcom_enqueue_next_buffer - Enqueue another audio buffer
+ * @s: pointer to stream private data structure
+ *
+ * Enqueues another audio period buffer into the bestcomm queue.
+ *
+ * Note: The routine must only be called when there is space available i=

n

sound/soc/fsl/mpc5200_dma.c line 65

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c new file +1 -0
+ * the queue. =A0Otherwise the enqueue will fail and the audio ring buff=

er

Quoted 14 lines
sound/soc/fsl/mpc5200_dma.c new file +14 -0
+ * will get out of sync
+ */
+static void psc_i2s_bcom_enqueue_next_buffer(struct psc_i2s_stream *s)
+{
+ =A0 =A0 =A0 struct bcom_bd *bd;
+
+ =A0 =A0 =A0 /* Prepare and enqueue the next buffer descriptor */
+ =A0 =A0 =A0 bd =3D bcom_prepare_next_buffer(s->bcom_task);
+ =A0 =A0 =A0 bd->status =3D s->period_bytes;
+ =A0 =A0 =A0 bd->data[0] =3D s->period_next_pt;
+ =A0 =A0 =A0 bcom_submit_next_buffer(s->bcom_task, NULL);
+
+ =A0 =A0 =A0 /* Update for next period */
+ =A0 =A0 =A0 s->period_next_pt +=3D s->period_bytes;

sound/soc/fsl/mpc5200_dma.c

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.c new file +10 -0
+ =A0 =A0 =A0 if (s->period_next_pt >=3D s->period_end)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_next_pt =3D s->period_start;
+}
+
+/* Bestcomm DMA irq handler */
+static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream)
+{
+ =A0 =A0 =A0 struct psc_i2s_stream *s =3D _psc_i2s_stream;
+
+ =A0 =A0 =A0 /* For each finished period, dequeue the completed period b=

uffer

sound/soc/fsl/mpc5200_dma.c line 92

Quoted 3 lines
sound/soc/fsl/mpc5200_dma.c new file +3 -0
+ =A0 =A0 =A0 =A0* and enqueue a new one in it's place. */
+ =A0 =A0 =A0 while (bcom_buffer_done(s->bcom_task)) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_retrieve_buffer(s->bcom_task, NULL, NU=

LL);

sound/soc/fsl/mpc5200_dma.c line 94

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c new file +2 -0
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_current_pt +=3D s->period_bytes;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (s->period_current_pt >=3D s->period_end=

)

Quoted 7 lines
sound/soc/fsl/mpc5200_dma.c new file +1 -0
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_current_pt =3D s-=

period_start;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_buffer(s);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_enable(s->bcom_task);
+ =A0 =A0 =A0 }
+
+ =A0 =A0 =A0 /* If the stream is active, then also inform the PCM middle=

layer

sound/soc/fsl/mpc5200_dma.c

Quoted 13 lines

+ =A0 =A0 =A0 =A0* of the period finished event. */
+ =A0 =A0 =A0 if (s->active)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 snd_pcm_period_elapsed(s->stream);

sound/soc/fsl/mpc5200_dma.c new file +10 -0
+
+ =A0 =A0 =A0 return IRQ_HANDLED;
+}
+
+/**
+ * psc_i2s_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

Quoted 4 lines

+ * the PSC registers.
+ */
+int psc_i2s_startup(struct snd_pcm_substream *substream,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai)

Quoted 2 lines

+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

+ =A0 =A0 =A0 int rc;
+
+ =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_startup(substream=3D%p)\n", =

substream);

Quoted 5 lines

+
+ =A0 =A0 =A0 if (!psc_i2s->playback.active &&
+ =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Setup the IRQs */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D request_irq(psc_i2s->irq, &psc_i2s_s=

tatus_irq, IRQF_SHARED,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"psc-i2s=

-status", psc_i2s);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->capture.irq,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i2=

s_bcom_irq, IRQF_SHARED,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i2=

s-capture", &psc_i2s->capture);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->playback.irq,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i2=

s_bcom_irq, IRQF_SHARED,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i2=

s-playback", &psc_i2s->playback);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (rc) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc_=

i2s);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.i=

rq,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2s=

->capture);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback.=

irq,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2s=

->playback);

sound/soc/fsl/mpc5200_dma.c

Quoted 9 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -ENODEV;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
+ =A0 =A0 =A0 }

sound/soc/fsl/mpc5200_dma.c new file +6 -0
+
+ =A0 =A0 =A0 return 0;
+}
+
+int psc_i2s_hw_free(struct snd_pcm_substream *substream,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai)

sound/soc/fsl/mpc5200_dma.c

Quoted 9 lines
sound/soc/fsl/mpc5200_dma.c new file +9 -0
+{
+ =A0 =A0 =A0 snd_pcm_set_runtime_buffer(substream, NULL);
+ =A0 =A0 =A0 return 0;
+}
+
+/**
+ * psc_i2s_trigger: start and stop the DMA transfer.
+ *
+ * This function is called by ALSA to start, stop, pause, and resume the=

DMA

Quoted 4 lines

+ * transfer of data.
+ */
+int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai)

Quoted 2 lines

+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 8 lines

+ =A0 =A0 =A0 struct snd_pcm_runtime *runtime =3D substream->runtime;
+ =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
+ =A0 =A0 =A0 u16 imr;
+ =A0 =A0 =A0 u8 psc_cmd;
+ =A0 =A0 =A0 unsigned long flags;
+
+ =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

Quoted 5 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 else
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+
+ =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_trigger(substream=3D%p, cmd=

=3D%i)"

Quoted 6 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 " stream_id=3D%i\n",
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream, cmd, substream->pstr->stream); +
+ =A0 =A0 =A0 switch (cmd) {
+ =A0 =A0 =A0 case SNDRV_PCM_TRIGGER_START:
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_bytes =3D frames_to_bytes(runtime=

,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

=A0 =A0 =A0 =A0 =A0 =A0 runtime->period_size);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_start =3D virt_to_phys(runtime->d=

ma_area);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_end =3D s->period_start +
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (s->period_=

bytes * runtime->periods);

Quoted 6 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_next_pt =3D s->period_start;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_current_pt =3D s->period_start;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->active =3D 1;
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* First; reset everything */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_CAPTURE) {

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_RX);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_ERR_STAT);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_TX);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_ERR_STAT);

Quoted 3 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Next, fill up the bestcomm bd queue and =

enable DMA.

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* This will begin filling the PSC's fifo=

. */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_CAPTURE)

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_gen_bd_rx_reset(s->bco=

m_task);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 else
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_gen_bd_tx_reset(s->bco=

m_task);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 while (!bcom_queue_full(s->bcom_task))
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_b=

uffer(s);

Quoted 3 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_enable(s->bcom_task);
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Due to errata in the i2s mode; need to l=

ine up enabling

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* the transmitter with a transition on t=

he frame sync

Quoted 5 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* line */
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_lock_irqsave(&psc_i2s->lock, flags);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* first make sure it is low */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) =

!=3D 0)

Quoted 3 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* then wait for the transition to high */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) =

=3D=3D 0)

Quoted 3 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Finally, enable the PSC.
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* Receiver must always be enabled; even =

when we only want

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* transmit. =A0(see 15.3.2.3 of MPC5200B=

User's Guide) */

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_cmd =3D MPC52xx_PSC_RX_ENABLE;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_PLAYBACK)

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_cmd |=3D MPC52xx_PSC_TX=

_ENABLE;

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, psc_cmd);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_unlock_irqrestore(&psc_i2s->lock, flag=

s);

sound/soc/fsl/mpc5200_dma.c

Quoted 7 lines
sound/soc/fsl/mpc5200_dma.c new file +7 -0
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
+
+ =A0 =A0 =A0 case SNDRV_PCM_TRIGGER_STOP:
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Turn off the PSC */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->active =3D 0;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_CAPTURE) {

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->playback.acti=

ve) {

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 2 << 4); =A0/* reset rx */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 3 << 4); =A0/* reset tx */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 4 << 4); =A0/* reset err */

Quoted 3 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, 3 << =

4); =A0/* reset tx */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, 4 << =

4); =A0/* reset err */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->capture.activ=

e)

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 2 << 4); =A0/* reset rx */

Quoted 5 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_disable(s->bcom_task);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 while (!bcom_queue_empty(s->bcom_task))
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_retrieve_buffer(s->bco=

m_task, NULL, NULL);

Quoted 16 lines
sound/soc/fsl/mpc5200_dma.c new file +16 -0
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
+
+ =A0 =A0 =A0 default:
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "invalid command\n");
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -EINVAL;
+ =A0 =A0 =A0 }
+
+ =A0 =A0 =A0 /* Update interrupt enable settings */
+ =A0 =A0 =A0 imr =3D 0;
+ =A0 =A0 =A0 if (psc_i2s->playback.active)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 imr |=3D MPC52xx_PSC_IMR_TXEMP;
+ =A0 =A0 =A0 if (psc_i2s->capture.active)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 imr |=3D MPC52xx_PSC_IMR_ORERR;
+ =A0 =A0 =A0 out_be16(&regs->isr_imr.imr, imr);
+

sound/soc/fsl/mpc5200_dma.c

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.c new file +10 -0
+ =A0 =A0 =A0 return 0;
+}
+
+/**
+ * psc_i2s_shutdown: shutdown the data transfer on a stream
+ *
+ * Shutdown the PSC if there are no other substreams open.
+ */
+void psc_i2s_shutdown(struct snd_pcm_substream *substream,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_d=

ai *dai)

Quoted 2 lines

+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 2 lines

+
+ =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_shutdown(substream=3D%p)\n",=

substream);

Quoted 3 lines

+
+ =A0 =A0 =A0 /*
+ =A0 =A0 =A0 =A0* If this is the last active substream, disable the PSC =

and release

Quoted 6 lines

+ =A0 =A0 =A0 =A0* the IRQ.
+ =A0 =A0 =A0 =A0*/
+ =A0 =A0 =A0 if (!psc_i2s->playback.active &&
+ =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Disable all interrupts and reset the PSC=

*/

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0=

);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 3 << 4);=

/* reset tx */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 2 << 4);=

/* reset rx */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 1 << 4);=

/* reset mode */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 4 << 4);=

/* reset error */

Quoted 4 lines

+
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Release irqs */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc_i2s);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.irq, &psc_i2s->ca=

pture);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback.irq, &psc_i2s->p=

layback);

Quoted 4 lines

+ =A0 =A0 =A0 }

sound/soc/fsl/mpc5200_dma.c new file +3 -0
+}
+
+/* ---------------------------------------------------------------------

sound/soc/fsl/mpc5200_dma.c

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.c new file +10 -0
+ * The PSC DMA 'ASoC platform' driver
+ *
+ * Can be referenced by an 'ASoC machine' driver
+ * This driver only deals with the audio bus; it doesn't have any
+ * interaction with the attached codec
+ */
+
+static const struct snd_pcm_hardware psc_i2s_pcm_hardware =3D {
+ =A0 =A0 =A0 .info =3D SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO=

_BLOCK_TRANSFER,

Quoted 1 line

+ =A0 =A0 =A0 .formats =3D SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE =

|

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_=

FMTBIT_S32_BE,

Quoted 10 lines

+ =A0 =A0 =A0 .rate_min =3D 8000,
+ =A0 =A0 =A0 .rate_max =3D 48000,
+ =A0 =A0 =A0 .channels_min =3D 2,
+ =A0 =A0 =A0 .channels_max =3D 2,
+ =A0 =A0 =A0 .period_bytes_max =A0 =A0 =A0 =3D 1024 * 1024,
+ =A0 =A0 =A0 .period_bytes_min =A0 =A0 =A0 =3D 32,
+ =A0 =A0 =A0 .periods_min =A0 =A0 =A0 =A0 =A0 =A0=3D 2,
+ =A0 =A0 =A0 .periods_max =A0 =A0 =A0 =A0 =A0 =A0=3D 256,
+ =A0 =A0 =A0 .buffer_bytes_max =A0 =A0 =A0 =3D 2 * 1024 * 1024,
+ =A0 =A0 =A0 .fifo_size =A0 =A0 =A0 =A0 =A0 =A0 =A0=3D 0,

sound/soc/fsl/mpc5200_dma.c

Quoted 5 lines
sound/soc/fsl/mpc5200_dma.c new file +5 -0
+};
+
+static int psc_i2s_pcm_open(struct snd_pcm_substream *substream)
+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

+ =A0 =A0 =A0 struct psc_i2s_stream *s;
+
+ =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_open(substream=3D%p)\n",=

substream);

Quoted 2 lines

+
+ =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

Quoted 5 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 else
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+
+ =A0 =A0 =A0 snd_soc_set_runtime_hwparams(substream, &psc_i2s_pcm_hardwa=

re);

sound/soc/fsl/mpc5200_dma.c

Quoted 8 lines
sound/soc/fsl/mpc5200_dma.c new file +8 -0
+
+ =A0 =A0 =A0 s->stream =3D substream;
+ =A0 =A0 =A0 return 0;
+}
+
+static int psc_i2s_pcm_close(struct snd_pcm_substream *substream)
+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

+ =A0 =A0 =A0 struct psc_i2s_stream *s;
+
+ =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_close(substream=3D%p)\n"=

, substream);

Quoted 2 lines

+
+ =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

sound/soc/fsl/mpc5200_dma.c

Quoted 12 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 else
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;

sound/soc/fsl/mpc5200_dma.c new file +9 -0
+
+ =A0 =A0 =A0 s->stream =3D NULL;
+ =A0 =A0 =A0 return 0;
+}
+
+static snd_pcm_uframes_t
+psc_i2s_pcm_pointer(struct snd_pcm_substream *substream)
+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 4 lines

+ =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 dma_addr_t count;
+
+ =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

Quoted 8 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 else
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;

sound/soc/fsl/mpc5200_dma.c new file +5 -0
+
+ =A0 =A0 =A0 count =3D s->period_current_pt - s->period_start;
+
+ =A0 =A0 =A0 return bytes_to_frames(substream->runtime, count);
+}

sound/soc/fsl/mpc5200_dma.c

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.c new file +10 -0
+
+static struct snd_pcm_ops psc_i2s_pcm_ops =3D {
+ =A0 =A0 =A0 .open =A0 =A0 =A0 =A0 =A0 =3D psc_i2s_pcm_open,
+ =A0 =A0 =A0 .close =A0 =A0 =A0 =A0 =A0=3D psc_i2s_pcm_close,
+ =A0 =A0 =A0 .ioctl =A0 =A0 =A0 =A0 =A0=3D snd_pcm_lib_ioctl,
+ =A0 =A0 =A0 .pointer =A0 =A0 =A0 =A0=3D psc_i2s_pcm_pointer,
+};
+
+static u64 psc_i2s_pcm_dmamask =3D 0xffffffff;
+static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *da=

i,

sound/soc/fsl/mpc5200_dma.c

Quoted 7 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_pcm *pcm)

sound/soc/fsl/mpc5200_dma.c new file +6 -0
+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
+ =A0 =A0 =A0 size_t size =3D psc_i2s_pcm_hardware.buffer_bytes_max;
+ =A0 =A0 =A0 int rc =3D 0;
+
+ =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_new(card=3D%p, dai=

=3D%p, pcm=3D%p)\n",

Quoted 4 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 card, dai, pcm);
+
+ =A0 =A0 =A0 if (!card->dev->dma_mask)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->dma_mask =3D &psc_i2s_pcm_dmamas=

k;

Quoted 2 lines

+ =A0 =A0 =A0 if (!card->dev->coherent_dma_mask)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->coherent_dma_mask =3D 0xffffffff=

;

Quoted 3 lines

+
+ =A0 =A0 =A0 if (pcm->streams[0].substream) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D snd_dma_alloc_pages(SNDRV_DMA_TYPE_D=

EV, pcm->dev, size,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

=A0 &pcm->streams[0].substream->dma_buffer);

Quoted 6 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (rc)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto playback_alloc_err;
+ =A0 =A0 =A0 }
+
+ =A0 =A0 =A0 if (pcm->streams[1].substream) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D snd_dma_alloc_pages(SNDRV_DMA_TYPE_D=

EV, pcm->dev, size,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

=A0 &pcm->streams[1].substream->dma_buffer);

sound/soc/fsl/mpc5200_dma.c

Quoted 9 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (rc)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto capture_alloc_err;
+ =A0 =A0 =A0 }

sound/soc/fsl/mpc5200_dma.c new file +6 -0
+
+ =A0 =A0 =A0 return 0;
+
+ capture_alloc_err:
+ =A0 =A0 =A0 if (pcm->streams[0].substream)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 snd_dma_free_pages(&pcm->streams[0].substre=

am->dma_buffer);

sound/soc/fsl/mpc5200_dma.c

Quoted 12 lines

+ playback_alloc_err:
+ =A0 =A0 =A0 dev_err(card->dev, "Cannot allocate buffer(s)\n");
+ =A0 =A0 =A0 return -ENOMEM;

sound/soc/fsl/mpc5200_dma.c new file +9 -0
+}
+
+static void psc_i2s_pcm_free(struct snd_pcm *pcm)
+{
+ =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
+ =A0 =A0 =A0 struct snd_pcm_substream *substream;
+ =A0 =A0 =A0 int stream;
+
+ =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_free(pcm=3D%p)\n", p=

cm);

Quoted 3 lines

+
+ =A0 =A0 =A0 for (stream =3D 0; stream < 2; stream++) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream =3D pcm->streams[stream].substrea=

m;

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 snd_dma_free_pages(&substre=

am->dma_buffer);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream->dma_buffer.area =

=3D NULL;

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream->dma_buffer.addr =

=3D 0;

Quoted 17 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
+ =A0 =A0 =A0 }

sound/soc/fsl/mpc5200_dma.c new file +9 -0
+}
+
+struct snd_soc_platform psc_i2s_pcm_soc_platform =3D {
+ =A0 =A0 =A0 .name =A0 =A0 =A0 =A0 =A0 =3D "mpc5200-psc-audio",
+ =A0 =A0 =A0 .pcm_ops =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_ops,
+ =A0 =A0 =A0 .pcm_new =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_new,
+ =A0 =A0 =A0 .pcm_free =A0 =A0 =A0 =3D &psc_i2s_pcm_free,
+};
+
sound/soc/fsl/mpc5200_dma.h new file +0 -0
new file mode 100644
index 0000000..9a19e8a

sound/soc/fsl/mpc5200_dma.h line 9

Quoted 9 lines
sound/soc/fsl/mpc5200_dma.h new file +9 -0
@@ -0,0 +1,81 @@
+/*
+ * Freescale MPC5200 Audio DMA driver
+ */
+
+#ifndef __SOUND_SOC_FSL_MPC5200_DMA_H__
+#define __SOUND_SOC_FSL_MPC5200_DMA_H__
+
+/**
+ * psc_i2s_stream - Data specific to a single stream (playback or captur=

e)

sound/soc/fsl/mpc5200_dma.h line 10

Quoted 1 line
sound/soc/fsl/mpc5200_dma.h new file +1 -0
+ * @active: =A0 =A0 =A0 =A0 =A0 =A0flag indicating if the stream is acti=

ve

sound/soc/fsl/mpc5200_dma.h line 11

Quoted 1 line
sound/soc/fsl/mpc5200_dma.h new file +1 -0
+ * @psc_i2s: =A0 =A0 =A0 =A0 =A0 pointer back to parent psc_i2s data str=

ucture

sound/soc/fsl/mpc5200_dma.h line 15

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h new file +4 -0
+ * @bcom_task: =A0 =A0 =A0 =A0 bestcomm task structure
+ * @irq: =A0 =A0 =A0 =A0 =A0 =A0 =A0 irq number for bestcomm task
+ * @period_start: =A0 =A0 =A0physical address of start of DMA region
+ * @period_end: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0physical address of end o=

f DMA region

sound/soc/fsl/mpc5200_dma.h line 16

Quoted 1 line
sound/soc/fsl/mpc5200_dma.h new file +1 -0
+ * @period_next_pt: =A0 =A0physical address of next DMA buffer to enqueu=

e

Quoted 14 lines
sound/soc/fsl/mpc5200_dma.h new file +14 -0
+ * @period_bytes: =A0 =A0 =A0size of DMA period in bytes
+ */
+struct psc_i2s_stream {
+ =A0 =A0 =A0 int active;
+ =A0 =A0 =A0 struct psc_i2s *psc_i2s;
+ =A0 =A0 =A0 struct bcom_task *bcom_task;
+ =A0 =A0 =A0 int irq;
+ =A0 =A0 =A0 struct snd_pcm_substream *stream;
+ =A0 =A0 =A0 dma_addr_t period_start;
+ =A0 =A0 =A0 dma_addr_t period_end;
+ =A0 =A0 =A0 dma_addr_t period_next_pt;
+ =A0 =A0 =A0 dma_addr_t period_current_pt;
+ =A0 =A0 =A0 int period_bytes;
+};

sound/soc/fsl/mpc5200_dma.h

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.h new file +10 -0
+
+/**
+ * psc_i2s - Private driver data
+ * @name: short name for this device ("PSC0", "PSC1", etc)
+ * @psc_regs: pointer to the PSC's registers
+ * @fifo_regs: pointer to the PSC's FIFO registers
+ * @irq: IRQ of this PSC
+ * @dev: struct device pointer
+ * @dai: the CPU DAI for this device
+ * @sicr: Base value used in serial interface control register; mode is =

ORed

Quoted 18 lines
sound/soc/fsl/mpc5200_dma.h new file +18 -0
+ * =A0 =A0 =A0 =A0with this value.
+ * @playback: Playback stream context data
+ * @capture: Capture stream context data
+ */
+struct psc_i2s {
+ =A0 =A0 =A0 char name[32];
+ =A0 =A0 =A0 struct mpc52xx_psc __iomem *psc_regs;
+ =A0 =A0 =A0 struct mpc52xx_psc_fifo __iomem *fifo_regs;
+ =A0 =A0 =A0 unsigned int irq;
+ =A0 =A0 =A0 struct device *dev;
+ =A0 =A0 =A0 struct snd_soc_dai dai;
+ =A0 =A0 =A0 spinlock_t lock;
+ =A0 =A0 =A0 u32 sicr;
+
+ =A0 =A0 =A0 /* per-stream data */
+ =A0 =A0 =A0 struct psc_i2s_stream playback;
+ =A0 =A0 =A0 struct psc_i2s_stream capture;
+

sound/soc/fsl/mpc5200_dma.h line 68

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.h new file +10 -0
+ =A0 =A0 =A0 /* Statistics */
+ =A0 =A0 =A0 struct {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 int overrun_count;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 int underrun_count;
+ =A0 =A0 =A0 } stats;
+};
+
+
+int psc_i2s_startup(struct snd_pcm_substream *substream,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai);

sound/soc/fsl/mpc5200_dma.h line 71

Quoted 3 lines
sound/soc/fsl/mpc5200_dma.h new file +3 -0
+
+int psc_i2s_hw_free(struct snd_pcm_substream *substream,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai);

sound/soc/fsl/mpc5200_dma.h line 74

Quoted 3 lines
sound/soc/fsl/mpc5200_dma.h new file +3 -0
+
+void psc_i2s_shutdown(struct snd_pcm_substream *substream,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_d=

ai *dai);

sound/soc/fsl/mpc5200_dma.h line 77

Quoted 3 lines
sound/soc/fsl/mpc5200_dma.h new file +3 -0
+
+int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai);

sound/soc/fsl/mpc5200_psc_=

Quoted 5 lines
sound/soc/fsl/mpc5200_dma.h new file +4 -0
+
+extern struct snd_soc_platform psc_i2s_pcm_soc_platform;
+
+#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */
sound/soc/fsl/mpc5200_psc_= renamed from sound/soc/fsl/mpc5200_psc_i2s.c +0 -0

i2s.c

Quoted 13 lines

index 3aa729d..8974b53 100644

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -25,6 +25,8 @@

=A0#include <sysdev/bestcomm/gen_bd.h>
=A0#include <asm/mpc52xx_psc.h>

sound/soc/fsl/mpc5200_psc_i2s.c +2 -0
+#include "mpc5200_dma.h"
+

=A0MODULE_AUTHOR("Grant Likely <[email protected]>"); =A0MODULE_DESCRIPTION("Freescale MPC5200 PSC in I2S mode ASoC Driver"); =A0MODULE_LICENSE("GPL");

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -47,179 +49,6 @@ MODULE_LICENSE("GPL");
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 SNDRV_PCM_FMTBIT_S24_BE |=

SNDRV_PCM_FMTBIT_S24_BE | \

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 SNDRV_PCM_FMTBIT_S32_BE)

-/**
- * psc_i2s_stream - Data specific to a single stream (playback or captur=

e)

Quoted 1 line

- * @active: =A0 =A0 =A0 =A0 =A0 =A0flag indicating if the stream is acti=

ve

Quoted 1 line

- * @psc_i2s: =A0 =A0 =A0 =A0 =A0 pointer back to parent psc_i2s data str=

ucture

Quoted 4 lines

- * @bcom_task: =A0 =A0 =A0 =A0 bestcomm task structure
- * @irq: =A0 =A0 =A0 =A0 =A0 =A0 =A0 irq number for bestcomm task
- * @period_start: =A0 =A0 =A0physical address of start of DMA region
- * @period_end: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0physical address of end o=

f DMA region

Quoted 1 line

- * @period_next_pt: =A0 =A0physical address of next DMA buffer to enqueu=

e

Quoted 14 lines

- * @period_bytes: =A0 =A0 =A0size of DMA period in bytes
- */

sound/soc/fsl/mpc5200_psc_i2s.c +0 -12
-struct psc_i2s_stream {
- =A0 =A0 =A0 int active;
- =A0 =A0 =A0 struct psc_i2s *psc_i2s;
- =A0 =A0 =A0 struct bcom_task *bcom_task;
- =A0 =A0 =A0 int irq;
- =A0 =A0 =A0 struct snd_pcm_substream *stream;
- =A0 =A0 =A0 dma_addr_t period_start;
- =A0 =A0 =A0 dma_addr_t period_end;
- =A0 =A0 =A0 dma_addr_t period_next_pt;
- =A0 =A0 =A0 dma_addr_t period_current_pt;
- =A0 =A0 =A0 int period_bytes;
-};

sound/soc/fsl/mpc5200_psc_i2s.c MODULE_LICENSE("GPL");

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -10
-
-/**
- * psc_i2s - Private driver data
- * @name: short name for this device ("PSC0", "PSC1", etc)
- * @psc_regs: pointer to the PSC's registers
- * @fifo_regs: pointer to the PSC's FIFO registers
- * @irq: IRQ of this PSC
- * @dev: struct device pointer
- * @dai: the CPU DAI for this device
- * @sicr: Base value used in serial interface control register; mode is =

ORed

Quoted 28 lines

- * =A0 =A0 =A0 =A0with this value.
- * @playback: Playback stream context data
- * @capture: Capture stream context data
- */

sound/soc/fsl/mpc5200_psc_i2s.c +0 -24
-struct psc_i2s {
- =A0 =A0 =A0 char name[32];
- =A0 =A0 =A0 struct mpc52xx_psc __iomem *psc_regs;
- =A0 =A0 =A0 struct mpc52xx_psc_fifo __iomem *fifo_regs;
- =A0 =A0 =A0 unsigned int irq;
- =A0 =A0 =A0 struct device *dev;
- =A0 =A0 =A0 struct snd_soc_dai dai;
- =A0 =A0 =A0 spinlock_t lock;
- =A0 =A0 =A0 u32 sicr;
-
- =A0 =A0 =A0 /* per-stream data */
- =A0 =A0 =A0 struct psc_i2s_stream playback;
- =A0 =A0 =A0 struct psc_i2s_stream capture;
-
- =A0 =A0 =A0 /* Statistics */
- =A0 =A0 =A0 struct {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 int overrun_count;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 int underrun_count;
- =A0 =A0 =A0 } stats;
-};
-
-/*
- * Interrupt handlers
- */

sound/soc/fsl/mpc5200_psc_i2s.c

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -10
-static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s)
-{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D _psc_i2s;
- =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
- =A0 =A0 =A0 u16 isr;
-
- =A0 =A0 =A0 isr =3D in_be16(&regs->mpc52xx_psc_isr);
-
- =A0 =A0 =A0 /* Playback underrun error */
- =A0 =A0 =A0 if (psc_i2s->playback.active && (isr & MPC52xx_PSC_IMR_TXEM=

P))

Quoted 4 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.underrun_count++; -
- =A0 =A0 =A0 /* Capture overrun error */
- =A0 =A0 =A0 if (psc_i2s->capture.active && (isr & MPC52xx_PSC_IMR_ORERR=

))

Quoted 3 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.overrun_count++; -
- =A0 =A0 =A0 out_8(&regs->command, 4 << 4); =A0/* reset the error status=

*/

sound/soc/fsl/mpc5200_psc_i2s.c MODULE_LICENSE("GPL");

Quoted 11 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -11
-
- =A0 =A0 =A0 return IRQ_HANDLED;
-}
-
-/**
- * psc_i2s_bcom_enqueue_next_buffer - Enqueue another audio buffer
- * @s: pointer to stream private data structure
- *
- * Enqueues another audio period buffer into the bestcomm queue.
- *
- * Note: The routine must only be called when there is space available i=

n

Quoted 1 line

- * the queue. =A0Otherwise the enqueue will fail and the audio ring buff=

er

Quoted 14 lines

- * will get out of sync
- */

sound/soc/fsl/mpc5200_psc_i2s.c +0 -12
-static void psc_i2s_bcom_enqueue_next_buffer(struct psc_i2s_stream *s)
-{
- =A0 =A0 =A0 struct bcom_bd *bd;
-
- =A0 =A0 =A0 /* Prepare and enqueue the next buffer descriptor */
- =A0 =A0 =A0 bd =3D bcom_prepare_next_buffer(s->bcom_task);
- =A0 =A0 =A0 bd->status =3D s->period_bytes;
- =A0 =A0 =A0 bd->data[0] =3D s->period_next_pt;
- =A0 =A0 =A0 bcom_submit_next_buffer(s->bcom_task, NULL);
-
- =A0 =A0 =A0 /* Update for next period */
- =A0 =A0 =A0 s->period_next_pt +=3D s->period_bytes;

sound/soc/fsl/mpc5200_psc_i2s.c

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -10
- =A0 =A0 =A0 if (s->period_next_pt >=3D s->period_end)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_next_pt =3D s->period_start;
-}
-
-/* Bestcomm DMA irq handler */
-static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream)
-{
- =A0 =A0 =A0 struct psc_i2s_stream *s =3D _psc_i2s_stream;
-
- =A0 =A0 =A0 /* For each finished period, dequeue the completed period b=

uffer

Quoted 3 lines

- =A0 =A0 =A0 =A0* and enqueue a new one in it's place. */
- =A0 =A0 =A0 while (bcom_buffer_done(s->bcom_task)) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_retrieve_buffer(s->bcom_task, NULL, NU=

LL);

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_current_pt +=3D s->period_bytes;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (s->period_current_pt >=3D s->period_end=

)

Quoted 7 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_current_pt =3D s-= period_start;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_buffer(s);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_enable(s->bcom_task);
- =A0 =A0 =A0 }
-
- =A0 =A0 =A0 /* If the stream is active, then also inform the PCM middle=

layer

sound/soc/fsl/mpc5200_psc_i2s.c MODULE_LICENSE("GPL");

Quoted 13 lines

- =A0 =A0 =A0 =A0* of the period finished event. */
- =A0 =A0 =A0 if (s->active)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 snd_pcm_period_elapsed(s->stream);

sound/soc/fsl/mpc5200_psc_i2s.c +0 -10
-
- =A0 =A0 =A0 return IRQ_HANDLED;
-}
-
-/**
- * psc_i2s_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

Quoted 4 lines

- * the PSC registers.
- */
-static int psc_i2s_startup(struct snd_pcm_substream *substream,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai)

Quoted 2 lines

-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

- =A0 =A0 =A0 int rc;
-
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_startup(substream=3D%p)\n", =

substream);

Quoted 5 lines

-
- =A0 =A0 =A0 if (!psc_i2s->playback.active &&
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Setup the IRQs */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D request_irq(psc_i2s->irq, &psc_i2s_s=

tatus_irq, IRQF_SHARED,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"psc-i2s=

-status", psc_i2s);

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->capture.irq,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i2=

s_bcom_irq, IRQF_SHARED,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i2=

s-capture", &psc_i2s->capture);

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->playback.irq,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i2=

s_bcom_irq, IRQF_SHARED,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i2=

s-playback", &psc_i2s->playback);

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (rc) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc_=

i2s);

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.i=

rq,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2s=

->capture);

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback.=

irq,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2s=

->playback);

Quoted 9 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -ENODEV;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
- =A0 =A0 =A0 }

sound/soc/fsl/mpc5200_psc_i2s.c +0 -4
-
- =A0 =A0 =A0 return 0;
-}
-

=A0static int psc_i2s_hw_params(struct snd_pcm_substream *substream, =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct sn=

d_pcm_hw_params *params,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct sn=

d_soc_dai *dai)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea=

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -258,164 +87,6 @@ static int psc_i2s_hw_params(struct snd_pcm_substrea=

m *substream,

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 262

Quoted 5 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
 =A0 =A0 =A0 =A0return 0;
 =A0}
 
-static int psc_i2s_hw_free(struct snd_pcm_substream *substream,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substream *substream,

Quoted 9 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -9
-{
- =A0 =A0 =A0 snd_pcm_set_runtime_buffer(substream, NULL);
- =A0 =A0 =A0 return 0;
-}
-
-/**
- * psc_i2s_trigger: start and stop the DMA transfer.
- *
- * This function is called by ALSA to start, stop, pause, and resume the=

DMA

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substream *substream,

Quoted 4 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -4
- * transfer of data.
- */
-static int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_dai *=

dai)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 277

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 278

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 286

Quoted 8 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -8
- =A0 =A0 =A0 struct snd_pcm_runtime *runtime =3D substream->runtime;
- =A0 =A0 =A0 struct psc_i2s_stream *s;
- =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
- =A0 =A0 =A0 u16 imr;
- =A0 =A0 =A0 u8 psc_cmd;
- =A0 =A0 =A0 unsigned long flags;
-
- =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 291

Quoted 5 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -5
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
- =A0 =A0 =A0 else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
-
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_trigger(substream=3D%p, cmd=

=3D%i)"

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 297

Quoted 6 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -6
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 " stream_id=3D%i\n",
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream, cmd, substream->pstr->stream);
-
- =A0 =A0 =A0 switch (cmd) {
- =A0 =A0 =A0 case SNDRV_PCM_TRIGGER_START:
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_bytes =3D frames_to_bytes(runtime=

,

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 298

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

=A0 =A0 =A0 =A0 =A0 =A0 runtime->period_size);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 299

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_start =3D virt_to_phys(runtime->d=

ma_area);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 301

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_end =3D s->period_start +
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (s->period_=

bytes * runtime->periods);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 307

Quoted 6 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -6
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_next_pt =3D s->period_start;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->period_current_pt =3D s->period_start;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->active =3D 1;
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* First; reset everything */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_CAPTURE) {

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 308

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_RX);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 309

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_ERR_STAT);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 311

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_TX);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 312

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, MPC52=

xx_PSC_RST_ERR_STAT);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 315

Quoted 3 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -3
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Next, fill up the bestcomm bd queue and =

enable DMA.

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 316

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* This will begin filling the PSC's fifo=

. */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 317

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_CAPTURE)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 318

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_gen_bd_rx_reset(s->bco=

m_task);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 320

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_gen_bd_tx_reset(s->bco=

m_task);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 322

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 while (!bcom_queue_full(s->bcom_task))
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_b=

uffer(s);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 325

Quoted 3 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -3
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_enable(s->bcom_task);
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Due to errata in the i2s mode; need to l=

ine up enabling

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 326

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* the transmitter with a transition on t=

he frame sync

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 331

Quoted 5 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -5
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* line */
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_lock_irqsave(&psc_i2s->lock, flags);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* first make sure it is low */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) =

!=3D 0)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 334

Quoted 3 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -3
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* then wait for the transition to high */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) =

=3D=3D 0)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 337

Quoted 3 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -3
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Finally, enable the PSC.
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* Receiver must always be enabled; even =

when we only want

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 338

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* transmit. =A0(see 15.3.2.3 of MPC5200B=

User's Guide) */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 340

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_cmd =3D MPC52xx_PSC_RX_ENABLE;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_PLAYBACK)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 341

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_cmd |=3D MPC52xx_PSC_TX=

_ENABLE;

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 343

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, psc_cmd);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_unlock_irqrestore(&psc_i2s->lock, flag=

s);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 350

Quoted 7 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -7
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
-
- =A0 =A0 =A0 case SNDRV_PCM_TRIGGER_STOP:
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Turn off the PSC */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s->active =3D 0;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PC=

M_STREAM_CAPTURE) {

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 351

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->playback.acti=

ve) {

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 352

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 2 << 4); =A0/* reset rx */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 353

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 3 << 4); =A0/* reset tx */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 354

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 4 << 4); =A0/* reset err */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 357

Quoted 3 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -3
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, 3 << =

4); =A0/* reset tx */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 358

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs->command, 4 << =

4); =A0/* reset err */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 359

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->capture.activ=

e)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 360

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&regs=

->command, 2 << 4); =A0/* reset rx */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 365

Quoted 5 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -5
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_disable(s->bcom_task);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 while (!bcom_queue_empty(s->bcom_task))
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_retrieve_buffer(s->bco=

m_task, NULL, NULL);

Quoted 16 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -16
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
-
- =A0 =A0 =A0 default:
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "invalid command\n");
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -EINVAL;
- =A0 =A0 =A0 }
-
- =A0 =A0 =A0 /* Update interrupt enable settings */
- =A0 =A0 =A0 imr =3D 0;
- =A0 =A0 =A0 if (psc_i2s->playback.active)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 imr |=3D MPC52xx_PSC_IMR_TXEMP;
- =A0 =A0 =A0 if (psc_i2s->capture.active)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 imr |=3D MPC52xx_PSC_IMR_ORERR;
- =A0 =A0 =A0 out_be16(&regs->isr_imr.imr, imr);
-

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 391

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -10
- =A0 =A0 =A0 return 0;
-}
-
-/**
- * psc_i2s_shutdown: shutdown the data transfer on a stream
- *
- * Shutdown the PSC if there are no other substreams open.
- */
-static void psc_i2s_shutdown(struct snd_pcm_substream *substream,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_soc_d=

ai *dai)

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 393

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 394

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 396

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -2
-
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_shutdown(substream=3D%p)\n",=

substream);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 399

Quoted 3 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -3
-
- =A0 =A0 =A0 /*
- =A0 =A0 =A0 =A0* If this is the last active substream, disable the PSC =

and release

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 405

Quoted 6 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -6
- =A0 =A0 =A0 =A0* the IRQ.
- =A0 =A0 =A0 =A0*/
- =A0 =A0 =A0 if (!psc_i2s->playback.active &&
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Disable all interrupts and reset the PSC=

*/

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 406

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0=

);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 407

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 3 << 4);=

/* reset tx */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 408

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 2 << 4);=

/* reset rx */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 409

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 1 << 4);=

/* reset mode */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 410

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 4 << 4);=

/* reset error */

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 414

Quoted 4 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -4
-
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Release irqs */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc_i2s);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.irq, &psc_i2s->ca=

pture);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea= · line 415

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -1
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback.irq, &psc_i2s->p=

layback);

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template =3D =

Quoted 7 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -3
- =A0 =A0 =A0 }
-}
-

=A0/**
=A0* psc_i2s_set_sysclk: set the clock frequency and direction =A0*

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -495,157 +166,6 @@ static struct snd_soc_dai psc_i2s_dai_template =3D =

{

Quoted 3 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0};
 

=A0/* -------------------------------------------------------------------=

--

sound/soc/fsl/mpc5200_psc_i2s.c

Quoted 10 lines

- * The PSC I2S 'ASoC platform' driver
- *
- * Can be referenced by an 'ASoC machine' driver
- * This driver only deals with the audio bus; it doesn't have any
- * interaction with the attached codec
- */

sound/soc/fsl/mpc5200_psc_i2s.c +0 -4
-
-static const struct snd_pcm_hardware psc_i2s_pcm_hardware =3D {
- =A0 =A0 =A0 .info =3D SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO=

_BLOCK_TRANSFER,

Quoted 1 line

- =A0 =A0 =A0 .formats =3D SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE =

|

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_=

FMTBIT_S32_BE,

Quoted 10 lines

- =A0 =A0 =A0 .rate_min =3D 8000,
- =A0 =A0 =A0 .rate_max =3D 48000,
- =A0 =A0 =A0 .channels_min =3D 2,
- =A0 =A0 =A0 .channels_max =3D 2,
- =A0 =A0 =A0 .period_bytes_max =A0 =A0 =A0 =3D 1024 * 1024,
- =A0 =A0 =A0 .period_bytes_min =A0 =A0 =A0 =3D 32,
- =A0 =A0 =A0 .periods_min =A0 =A0 =A0 =A0 =A0 =A0=3D 2,
- =A0 =A0 =A0 .periods_max =A0 =A0 =A0 =A0 =A0 =A0=3D 256,
- =A0 =A0 =A0 .buffer_bytes_max =A0 =A0 =A0 =3D 2 * 1024 * 1024,
- =A0 =A0 =A0 .fifo_size =A0 =A0 =A0 =A0 =A0 =A0 =A0=3D 0,

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template = {

Quoted 5 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -5
-};
-
-static int psc_i2s_pcm_open(struct snd_pcm_substream *substream)
-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
-
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_open(substream=3D%p)\n",=

substream);

Quoted 2 lines

-
- =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

Quoted 5 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
- =A0 =A0 =A0 else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
-
- =A0 =A0 =A0 snd_soc_set_runtime_hwparams(substream, &psc_i2s_pcm_hardwa=

re);

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template = {

Quoted 8 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -8
-
- =A0 =A0 =A0 s->stream =3D substream;
- =A0 =A0 =A0 return 0;
-}
-
-static int psc_i2s_pcm_close(struct snd_pcm_substream *substream)
-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
-
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_close(substream=3D%p)\n"=

, substream);

Quoted 2 lines

-
- =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template = {

Quoted 12 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
- =A0 =A0 =A0 else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -9
-
- =A0 =A0 =A0 s->stream =3D NULL;
- =A0 =A0 =A0 return 0;
-}
-
-static snd_pcm_uframes_t
-psc_i2s_pcm_pointer(struct snd_pcm_substream *substream)
-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D substream->private_data=

;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 4 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
- =A0 =A0 =A0 dma_addr_t count;
-
- =A0 =A0 =A0 if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTURE=

)

Quoted 8 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
- =A0 =A0 =A0 else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -5
-
- =A0 =A0 =A0 count =3D s->period_current_pt - s->period_start;
-
- =A0 =A0 =A0 return bytes_to_frames(substream->runtime, count);
-}

sound/soc/fsl/mpc5200_psc_i2s.c

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -10
-
-static struct snd_pcm_ops psc_i2s_pcm_ops =3D {
- =A0 =A0 =A0 .open =A0 =A0 =A0 =A0 =A0 =3D psc_i2s_pcm_open,
- =A0 =A0 =A0 .close =A0 =A0 =A0 =A0 =A0=3D psc_i2s_pcm_close,
- =A0 =A0 =A0 .ioctl =A0 =A0 =A0 =A0 =A0=3D snd_pcm_lib_ioctl,
- =A0 =A0 =A0 .pointer =A0 =A0 =A0 =A0=3D psc_i2s_pcm_pointer,
-};
-
-static u64 psc_i2s_pcm_dmamask =3D 0xffffffff;
-static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *da=

i,

sound/soc/fsl/mpc5200_psc_i2s.c

Quoted 7 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct snd_pcm *pcm)

sound/soc/fsl/mpc5200_psc_i2s.c +0 -6
-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
- =A0 =A0 =A0 size_t size =3D psc_i2s_pcm_hardware.buffer_bytes_max;
- =A0 =A0 =A0 int rc =3D 0;
-
- =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_new(card=3D%p, dai=

=3D%p, pcm=3D%p)\n",

Quoted 4 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 card, dai, pcm);
-
- =A0 =A0 =A0 if (!card->dev->dma_mask)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->dma_mask =3D &psc_i2s_pcm_dmamas=

k;

Quoted 2 lines

- =A0 =A0 =A0 if (!card->dev->coherent_dma_mask)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->coherent_dma_mask =3D 0xffffffff=

;

Quoted 3 lines

-
- =A0 =A0 =A0 if (pcm->streams[0].substream) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D snd_dma_alloc_pages(SNDRV_DMA_TYPE_D=

EV, pcm->dev, size,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

=A0 &pcm->streams[0].substream->dma_buffer);

Quoted 6 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (rc)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto playback_alloc_err;
- =A0 =A0 =A0 }
-
- =A0 =A0 =A0 if (pcm->streams[1].substream) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D snd_dma_alloc_pages(SNDRV_DMA_TYPE_D=

EV, pcm->dev, size,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

=A0 &pcm->streams[1].substream->dma_buffer);

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template = {

Quoted 9 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (rc)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto capture_alloc_err;
- =A0 =A0 =A0 }

sound/soc/fsl/mpc5200_psc_i2s.c +0 -6
-
- =A0 =A0 =A0 return 0;
-
- capture_alloc_err:
- =A0 =A0 =A0 if (pcm->streams[0].substream)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 snd_dma_free_pages(&pcm->streams[0].substre=

am->dma_buffer);

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template = {

Quoted 12 lines

- playback_alloc_err:
- =A0 =A0 =A0 dev_err(card->dev, "Cannot allocate buffer(s)\n");
- =A0 =A0 =A0 return -ENOMEM;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -9
-}
-
-static void psc_i2s_pcm_free(struct snd_pcm *pcm)
-{
- =A0 =A0 =A0 struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
- =A0 =A0 =A0 struct snd_pcm_substream *substream;
- =A0 =A0 =A0 int stream;
-
- =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_free(pcm=3D%p)\n", p=

cm);

Quoted 3 lines

-
- =A0 =A0 =A0 for (stream =3D 0; stream < 2; stream++) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream =3D pcm->streams[stream].substrea=

m;

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (substream) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 snd_dma_free_pages(&substre=

am->dma_buffer);

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream->dma_buffer.area =

=3D NULL;

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 substream->dma_buffer.addr =

=3D 0;

Quoted 12 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
- =A0 =A0 =A0 }

sound/soc/fsl/mpc5200_psc_i2s.c +0 -10
-}
-
-struct snd_soc_platform psc_i2s_pcm_soc_platform =3D {
- =A0 =A0 =A0 .name =A0 =A0 =A0 =A0 =A0 =3D "mpc5200-psc-audio",
- =A0 =A0 =A0 .pcm_ops =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_ops,
- =A0 =A0 =A0 .pcm_new =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_new,
- =A0 =A0 =A0 .pcm_free =A0 =A0 =A0 =3D &psc_i2s_pcm_free,
-};
-
-/* ---------------------------------------------------------------------
Quoted 5 lines

=A0* Sysfs attributes for debugging
=A0*/

--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

author
#3 lore raw

PATCH 2/3 Rename the PSC functions to DMA

In reply to Jon Smirl

Rename the functions in the mpc5200 DMA file from i2s to dma to reflect the file they are in.

---
 sound/soc/fsl/mpc5200_dma.c     |  194 ++++++++++++++++++++-------------------
 sound/soc/fsl/mpc5200_dma.h     |   26 +++--
 sound/soc/fsl/mpc5200_psc_i2s.c |  160 ++++++++++++++++----------------
 3 files changed, 190 insertions(+), 190 deletions(-)
sound/soc/fsl/mpc5200_dma.c +97 -97
index cccaff4..c82ef75 100644
@@ -34,21 +34,21 @@ MODULE_LICENSE("GPL");
 /*
  * 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 mpc52xx_psc __iomem *regs = psc_i2s->psc_regs;
+	struct psc_dma *psc_dma = _psc_dma;
+	struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs;
 	u16 isr;
 
 	isr = in_be16(&regs->mpc52xx_psc_isr);
 
 	/* Playback underrun error */
-	if (psc_i2s->playback.active && (isr & MPC52xx_PSC_IMR_TXEMP))
-		psc_i2s->stats.underrun_count++;
+	if (psc_dma->playback.active && (isr & MPC52xx_PSC_IMR_TXEMP))
+		psc_dma->stats.underrun_count++;
 
 	/* Capture overrun error */
-	if (psc_i2s->capture.active && (isr & MPC52xx_PSC_IMR_ORERR))
-		psc_i2s->stats.overrun_count++;
+	if (psc_dma->capture.active && (isr & MPC52xx_PSC_IMR_ORERR))
+		psc_dma->stats.overrun_count++;
 
 	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)
 }
 
 /**
- * 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
  *
  * 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)
  * the queue.  Otherwise the enqueue will fail and the audio ring buffer
  * 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;
 
@@ -82,9 +82,9 @@ static void psc_i2s_bcom_enqueue_next_buffer(struct psc_i2s_stream *s)
 }
 
 /* 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
 	 * 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)
 		s->period_current_pt += s->period_bytes;
 		if (s->period_current_pt >= s->period_end)
 			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);
 	}
 
@@ -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.
  *
  * If this is the first stream open, then grab the IRQ and program most of
  * 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_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;
 
-	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 &&
-	    !psc_i2s->capture.active) {
+	if (!psc_dma->playback.active &&
+	    !psc_dma->capture.active) {
 		/* Setup the IRQs */
-		rc = request_irq(psc_i2s->irq, &psc_i2s_status_irq, IRQF_SHARED,
-				 "psc-i2s-status", psc_i2s);
-		rc |= request_irq(psc_i2s->capture.irq,
-				  &psc_i2s_bcom_irq, IRQF_SHARED,
-				  "psc-i2s-capture", &psc_i2s->capture);
-		rc |= request_irq(psc_i2s->playback.irq,
-				  &psc_i2s_bcom_irq, IRQF_SHARED,
-				  "psc-i2s-playback", &psc_i2s->playback);
+		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, 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_i2s->irq, psc_i2s);
-			free_irq(psc_i2s->capture.irq,
-				 &psc_i2s->capture);
-			free_irq(psc_i2s->playback.irq,
-				 &psc_i2s->playback);
+			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;
 		}
 	}
@@ -146,7 +146,7 @@ int psc_i2s_startup(struct snd_pcm_substream *substream,
 	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)
 {
 	snd_pcm_set_runtime_buffer(substream, NULL);
@@ -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
  * 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_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 psc_i2s_stream *s;
-	struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs;
+	struct psc_dma_stream *s;
+	struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs;
 	u16 imr;
 	u8 psc_cmd;
 	unsigned long flags;
 
 	if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
-		s = &psc_i2s->capture;
+		s = &psc_dma->capture;
 	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",
 		substream, cmd, substream->pstr->stream);
 
@@ -207,14 +207,14 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
 		else
 			bcom_gen_bd_tx_reset(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);
 
-		/* 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
 		 * line */
 
-		spin_lock_irqsave(&psc_i2s->lock, flags);
+		spin_lock_irqsave(&psc_dma->lock, flags);
 		/* first make sure it is low */
 		while ((in_8(&regs->ipcr_acr.ipcr) & 0x80) != 0)
 			;
@@ -228,7 +228,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
 		if (substream->pstr->stream == SNDRV_PCM_STREAM_PLAYBACK)
 			psc_cmd |= MPC52xx_PSC_TX_ENABLE;
 		out_8(&regs->command, psc_cmd);
-		spin_unlock_irqrestore(&psc_i2s->lock, flags);
+		spin_unlock_irqrestore(&psc_dma->lock, flags);
 
 		break;
 
@@ -236,7 +236,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
 		/* Turn off the PSC */
 		s->active = 0;
 		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, 3 << 4);	/* reset tx */
 				out_8(&regs->command, 4 << 4);	/* reset err */
@@ -244,7 +244,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
 		} else {
 			out_8(&regs->command, 3 << 4);	/* reset tx */
 			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 */
 		}
 
@@ -255,15 +255,15 @@ int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
 		break;
 
 	default:
-		dev_dbg(psc_i2s->dev, "invalid command\n");
+		dev_dbg(psc_dma->dev, "invalid command\n");
 		return -EINVAL;
 	}
 
 	/* Update interrupt enable settings */
 	imr = 0;
-	if (psc_i2s->playback.active)
+	if (psc_dma->playback.active)
 		imr |= MPC52xx_PSC_IMR_TXEMP;
-	if (psc_i2s->capture.active)
+	if (psc_dma->capture.active)
 		imr |= MPC52xx_PSC_IMR_ORERR;
 	out_be16(&regs->isr_imr.imr, imr);
 
@@ -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.
  */
-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_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
 	 * the IRQ.
 	 */
-	if (!psc_i2s->playback.active &&
-	    !psc_i2s->capture.active) {
+	if (!psc_dma->playback.active &&
+	    !psc_dma->capture.active) {
 
 		/* Disable all interrupts and reset the PSC */
-		out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0);
-		out_8(&psc_i2s->psc_regs->command, 3 << 4); /* reset tx */
-		out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset rx */
-		out_8(&psc_i2s->psc_regs->command, 1 << 4); /* reset mode */
-		out_8(&psc_i2s->psc_regs->command, 4 << 4); /* reset error */
+		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_i2s->irq, psc_i2s);
-		free_irq(psc_i2s->capture.irq, &psc_i2s->capture);
-		free_irq(psc_i2s->playback.irq, &psc_i2s->playback);
+		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);
 	}
 }
 
@@ -312,7 +312,7 @@ void psc_i2s_shutdown(struct snd_pcm_substream *substream,
  * 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 |
 		SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER,
 	.formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE |
@@ -329,80 +329,80 @@ static const struct snd_pcm_hardware psc_i2s_pcm_hardware = {
 	.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 psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data;
-	struct psc_i2s_stream *s;
+	struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
+	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)
-		s = &psc_i2s->capture;
+		s = &psc_dma->capture;
 	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;
 	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 psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data;
-	struct psc_i2s_stream *s;
+	struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
+	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)
-		s = &psc_i2s->capture;
+		s = &psc_dma->capture;
 	else
-		s = &psc_i2s->playback;
+		s = &psc_dma->playback;
 
 	s->stream = NULL;
 	return 0;
 }
 
 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 psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data;
-	struct psc_i2s_stream *s;
+	struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data;
+	struct psc_dma_stream *s;
 	dma_addr_t count;
 
 	if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
-		s = &psc_i2s->capture;
+		s = &psc_dma->capture;
 	else
-		s = &psc_i2s->playback;
+		s = &psc_dma->playback;
 
 	count = s->period_current_pt - s->period_start;
 
 	return bytes_to_frames(substream->runtime, count);
 }
 
-static struct snd_pcm_ops psc_i2s_pcm_ops = {
-	.open		= psc_i2s_pcm_open,
-	.close		= psc_i2s_pcm_close,
+static struct snd_pcm_ops psc_dma_pcm_ops = {
+	.open		= psc_dma_pcm_open,
+	.close		= psc_dma_pcm_close,
 	.ioctl		= snd_pcm_lib_ioctl,
-	.pointer	= psc_i2s_pcm_pointer,
+	.pointer	= psc_dma_pcm_pointer,
 };
 
-static u64 psc_i2s_pcm_dmamask = 0xffffffff;
-static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
+static u64 psc_dma_pcm_dmamask = 0xffffffff;
+static int psc_dma_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
 			   struct snd_pcm *pcm)
 {
 	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;
 
-	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);
 
 	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)
 		card->dev->coherent_dma_mask = 0xffffffff;
 
@@ -430,13 +430,13 @@ static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
 	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_pcm_substream *substream;
 	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++) {
 		substream = pcm->streams[stream].substream;
@@ -448,10 +448,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",
-	.pcm_ops	= &psc_i2s_pcm_ops,
-	.pcm_new	= &psc_i2s_pcm_new,
-	.pcm_free	= &psc_i2s_pcm_free,
+	.pcm_ops	= &psc_dma_pcm_ops,
+	.pcm_new	= &psc_dma_pcm_new,
+	.pcm_free	= &psc_dma_pcm_free,
 };
 
sound/soc/fsl/mpc5200_dma.h +13 -13
index 9a19e8a..a33232c 100644
@@ -6,9 +6,9 @@
 #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
- * @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
  * @irq:		irq number for bestcomm task
  * @period_start:	physical address of start of DMA region
@@ -16,9 +16,9 @@
  * @period_next_pt:	physical address of next DMA buffer to enqueue
  * @period_bytes:	size of DMA period in bytes
  */
-struct psc_i2s_stream {
+struct psc_dma_stream {
 	int active;
-	struct psc_i2s *psc_i2s;
+	struct psc_dma *psc_dma;
 	struct bcom_task *bcom_task;
 	int irq;
 	struct snd_pcm_substream *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)
  * @psc_regs: pointer to the PSC's registers
  * @fifo_regs: pointer to the PSC's FIFO registers
@@ -42,7 +42,7 @@ struct psc_i2s_stream {
  * @playback: Playback stream context data
  * @capture: Capture stream context data
  */
-struct psc_i2s {
+struct psc_dma {
 	char name[32];
 	struct mpc52xx_psc __iomem *psc_regs;
 	struct mpc52xx_psc_fifo __iomem *fifo_regs;
@@ -53,8 +53,8 @@ struct psc_i2s {
 	u32 sicr;
 
 	/* per-stream data */
-	struct psc_i2s_stream playback;
-	struct psc_i2s_stream capture;
+	struct psc_dma_stream playback;
+	struct psc_dma_stream capture;
 
 	/* Statistics */
 	struct {
@@ -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);
 
-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);
 
-void psc_i2s_shutdown(struct snd_pcm_substream *substream,
+void psc_dma_shutdown(struct snd_pcm_substream *substream,
 			     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);
 
-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__ */
sound/soc/fsl/mpc5200_psc_i2s.c +80 -80

288 lines not on this page · raw message

Acked-by on v1 2/3
#4 lore raw

Re: [PATCH V1 2/3] Rename the PSC functions to DMA

Quoted 1 line · Jon Smirl

Rename the functions in the mpc5200 DMA file from i2s to dma to reflect t=

he file they are in.

Quoted 2 lines
Quoted 2 lines

---
=A0sound/soc/fsl/mpc5200_dma.c =A0 =A0 | =A0194 ++++++++++++++++++++-----=

--------------

Quoted 2 lines

=A0sound/soc/fsl/mpc5200_dma.h =A0 =A0 | =A0 26 +++-- =A0sound/soc/fsl/mpc5200_psc_i2s.c | =A0160 ++++++++++++++++-------------=

---

Quoted 19 lines

=A03 files changed, 190 insertions(+), 190 deletions(-)

sound/soc/fsl/mpc5200_dma.c +0 -0
index cccaff4..c82ef75 100644
@@ -34,21 +34,21 @@ MODULE_LICENSE("GPL");

=A0/*
=A0* Interrupt handlers
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s)
+static irqreturn_t psc_dma_status_irq(int irq, void *_psc_dma)

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D _psc_i2s;
- =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D _psc_dma;
+ =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_dma->psc_regs; =A0 =A0 =A0 =A0u16 isr;

Quoted 4 lines

=A0 =A0 =A0 =A0isr =3D in_be16(&regs->mpc52xx_psc_isr);

=A0 =A0 =A0 =A0/* Playback underrun error */
- =A0 =A0 =A0 if (psc_i2s->playback.active && (isr & MPC52xx_PSC_IMR_TXEM=

P))

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.underrun_count++;
+ =A0 =A0 =A0 if (psc_dma->playback.active && (isr & MPC52xx_PSC_IMR_TXEM=

P))

Quoted 4 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma->stats.underrun_count++;

=A0 =A0 =A0 =A0/* Capture overrun error */
- =A0 =A0 =A0 if (psc_i2s->capture.active && (isr & MPC52xx_PSC_IMR_ORERR=

))

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.overrun_count++;
+ =A0 =A0 =A0 if (psc_dma->capture.active && (isr & MPC52xx_PSC_IMR_ORERR=

))

Quoted 3 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma->stats.overrun_count++;

=A0 =A0 =A0 =A0out_8(&regs->command, 4 << 4); =A0/* reset the error statu=

s */

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_status_irq(int irq, void *_p=

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -56,7 +56,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_p=

sc_i2s)

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_status_irq(int irq, void *_p=

Quoted 9 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_bcom_enqueue_next_buffer - Enqueue another audio buffer
+ * psc_dma_bcom_enqueue_next_buffer - Enqueue another audio buffer =A0* @s: pointer to stream private data structure
=A0*
=A0* Enqueues another audio period buffer into the bestcomm queue.

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -65,7 +65,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_p=

sc_i2s)

Quoted 1 line

=A0* the queue. =A0Otherwise the enqueue will fail and the audio ring buf=

fer

sound/soc/fsl/mpc5200_dma.c static void psc_i2s_bcom_enqueue_next_buffer(struct psc=

Quoted 8 lines

=A0* will get out of sync
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-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)

=A0{
=A0 =A0 =A0 =A0struct bcom_bd *bd;

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -82,9 +82,9 @@ static void psc_i2s_bcom_enqueue_next_buffer(struct psc=

_i2s_stream *s)

Quoted 10 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/* Bestcomm DMA irq handler */

sound/soc/fsl/mpc5200_dma.c +1 -1
-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)

=A0{
- =A0 =A0 =A0 struct psc_i2s_stream *s =3D _psc_i2s_stream;
+ =A0 =A0 =A0 struct psc_dma_stream *s =3D _psc_dma_stream;

=A0 =A0 =A0 =A0/* For each finished period, dequeue the completed period =

buffer

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc=

Quoted 2 lines

=A0 =A0 =A0 =A0 * and enqueue a new one in it's place. */

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -93,7 +93,7 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc=

_i2s_stream)

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0s->period_current_pt +=3D s->period_bytes;

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (s->period_current_pt >=3D s->period_en=

d)

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0s->period_current_pt =3D s=

->period_start;

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_bcom_irq(int irq, void *=

Quoted 6 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_buffer(s);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma_bcom_enqueue_next_buffer(s); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_enable(s->bcom_task); =A0 =A0 =A0 =A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -106,39 +106,39 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void *=

_psc_i2s_stream)

Quoted 9 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_startup: create a new substream
+ * psc_dma_startup: create a new substream
=A0*
=A0* This is the first function called when a stream is opened. =A0*
=A0* If this is the first stream open, then grab the IRQ and program most=

of

Quoted 5 lines

=A0* the PSC registers.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_i2s_startup(struct snd_pcm_substream *substream,
+int psc_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai)

Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

=A0 =A0 =A0 =A0int rc;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_startup(substream=3D%p)\n", =

substream);

Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_startup(substream=3D%p)\n", =

substream);

Quoted 7 lines

- =A0 =A0 =A0 if (!psc_i2s->playback.active &&
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
+ =A0 =A0 =A0 if (!psc_dma->playback.active &&
+ =A0 =A0 =A0 =A0 =A0 !psc_dma->capture.active) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Setup the IRQs */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D request_irq(psc_i2s->irq, &psc_i2s_s=

tatus_irq, IRQF_SHARED,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"psc-i2s=

-status", psc_i2s);

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->capture.irq,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i2=

s_bcom_irq, IRQF_SHARED,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i2=

s-capture", &psc_i2s->capture);

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->playback.irq,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i2=

s_bcom_irq, IRQF_SHARED,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i2=

s-playback", &psc_i2s->playback);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D request_irq(psc_dma->irq, &psc_dma_s=

tatus_irq, IRQF_SHARED,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"psc-dma=

-status", psc_dma);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_dma->capture.irq,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_dm=

a_bcom_irq, IRQF_SHARED,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-dm=

a-capture", &psc_dma->capture);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_dma->playback.irq,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_dm=

a_bcom_irq, IRQF_SHARED,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-dm=

a-playback", &psc_dma->playback);

Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (rc) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc_=

i2s);

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.i=

rq,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2s=

->capture);

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback.=

irq,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2s=

->playback);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->irq, psc_=

dma);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->capture.i=

rq,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_dma=

->capture);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->playback.=

irq,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_dma=

->playback);

sound/soc/fsl/mpc5200_dma.c int psc_i2s_startup(struct snd_pcm_substream *substre=

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -ENODEV; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -146,7 +146,7 @@ int psc_i2s_startup(struct snd_pcm_substream *substre=

am,

Quoted 6 lines
sound/soc/fsl/mpc5200_dma.c +1 -1
 =A0 =A0 =A0 =A0return 0;
 =A0}
 
-int psc_i2s_hw_free(struct snd_pcm_substream *substream,
+int psc_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai)

sound/soc/fsl/mpc5200_dma.c int psc_i2s_hw_free(struct snd_pcm_substream *subst=

Quoted 3 lines

=A0{
=A0 =A0 =A0 =A0snd_pcm_set_runtime_buffer(substream, NULL);

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -154,29 +154,29 @@ int psc_i2s_hw_free(struct snd_pcm_substream *subst=

ream,

Quoted 7 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_trigger: start and stop the DMA transfer.
+ * psc_dma_trigger: start and stop the DMA transfer.
=A0*
=A0* This function is called by ALSA to start, stop, pause, and resume th=

e DMA

Quoted 5 lines

=A0* transfer of data.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
+int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai)

Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_data=

;

Quoted 10 lines

=A0 =A0 =A0 =A0struct snd_pcm_runtime *runtime =3D substream->runtime;
- =A0 =A0 =A0 struct psc_i2s_stream *s;
- =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
+ =A0 =A0 =A0 struct psc_dma_stream *s;
+ =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_dma->psc_regs; =A0 =A0 =A0 =A0u16 imr;
=A0 =A0 =A0 =A0u8 psc_cmd;
=A0 =A0 =A0 =A0unsigned long flags;

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTUR=

E)

Quoted 7 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_trigger(substream=3D%p, cmd=

=3D%i)"

Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_trigger(substream=3D%p, cmd=

=3D%i)"

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *subst=

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0" stream_id=3D%i\n",
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0substream, cmd, substream->pstr->stream);

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -207,14 +207,14 @@ int psc_i2s_trigger(struct snd_pcm_substream *subst=

ream, int cmd,

Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0else
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_gen_bd_tx_reset(s->bc=

om_task);

Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while (!bcom_queue_full(s->bcom_task))
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_b=

uffer(s);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma_bcom_enqueue_next_b=

uffer(s);

Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_enable(s->bcom_task);

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Due to errata in the i2s mode; need to l=

ine up enabling

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Due to errata in the dma mode; need to l=

ine up enabling

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * the transmitter with a transition on th=

e frame sync

Quoted 6 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * line */

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_lock_irqsave(&psc_i2s->lock, flags);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_lock_irqsave(&psc_dma->lock, flags); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* first make sure it is low */ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while ((in_8(&regs->ipcr_acr.ipcr) & 0x80)=

!=3D 0)

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *substre=

Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0;

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -228,7 +228,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substre=

am, int cmd,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_P=

CM_STREAM_PLAYBACK)

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0psc_cmd |=3D MPC52xx_PSC_T=

X_ENABLE;

Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&regs->command, psc_cmd);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_unlock_irqrestore(&psc_i2s->lock, flag=

s);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_unlock_irqrestore(&psc_dma->lock, flag=

s);

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *substre=

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -236,7 +236,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substre=

am, int cmd,

Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Turn off the PSC */
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0s->active =3D 0;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_P=

CM_STREAM_CAPTURE) {

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->playback.acti=

ve) {

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_dma->playback.acti=

ve) {

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&reg=

s->command, 2 << 4); =A0/* reset rx */

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&reg=

s->command, 3 << 4); =A0/* reset tx */

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&reg=

s->command, 4 << 4); =A0/* reset err */

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *substre=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -244,7 +244,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substre=

am, int cmd,

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} else {

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&regs->command, 3 <<=

4); =A0/* reset tx */

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&regs->command, 4 <<=

4); =A0/* reset err */

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->capture.activ=

e)

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_dma->capture.activ=

e)

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&reg=

s->command, 2 << 4); =A0/* reset rx */

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *subst=

Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -255,15 +255,15 @@ int psc_i2s_trigger(struct snd_pcm_substream *subst=

ream, int cmd,

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *subst=

Quoted 19 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
 

=A0 =A0 =A0 =A0default:
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "invalid command\n");
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_dma->dev, "invalid command\n"); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -EINVAL;
=A0 =A0 =A0 =A0}

=A0 =A0 =A0 =A0/* Update interrupt enable settings */ =A0 =A0 =A0 =A0imr =3D 0;
- =A0 =A0 =A0 if (psc_i2s->playback.active)
+ =A0 =A0 =A0 if (psc_dma->playback.active)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0imr |=3D MPC52xx_PSC_IMR_TXEMP;
- =A0 =A0 =A0 if (psc_i2s->capture.active)
+ =A0 =A0 =A0 if (psc_dma->capture.active)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0imr |=3D MPC52xx_PSC_IMR_ORERR; =A0 =A0 =A0 =A0out_be16(&regs->isr_imr.imr, imr);

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -271,36 +271,36 @@ int psc_i2s_trigger(struct snd_pcm_substream *subst=

ream, int cmd,

Quoted 11 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_shutdown: shutdown the data transfer on a stream
+ * psc_dma_shutdown: shutdown the data transfer on a stream =A0*
=A0* Shutdown the PSC if there are no other substreams open. =A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-void psc_i2s_shutdown(struct snd_pcm_substream *substream,
+void psc_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_da=

i *dai)

Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_data=

;

Quoted 2 lines

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_shutdown(substream=3D%p)\n",=

substream);

Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_shutdown(substream=3D%p)\n",=

substream);

Quoted 3 lines

=A0 =A0 =A0 =A0/*
=A0 =A0 =A0 =A0 * If this is the last active substream, disable the PSC a=

nd release

Quoted 8 lines

=A0 =A0 =A0 =A0 * the IRQ.
=A0 =A0 =A0 =A0 */
- =A0 =A0 =A0 if (!psc_i2s->playback.active &&
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
+ =A0 =A0 =A0 if (!psc_dma->playback.active &&
+ =A0 =A0 =A0 =A0 =A0 !psc_dma->capture.active) {

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Disable all interrupts and reset the PS=

C */

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0=

);

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 3 << 4);=

/* reset tx */

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 2 << 4);=

/* reset rx */

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 1 << 4);=

/* reset mode */

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 4 << 4);=

/* reset error */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_be16(&psc_dma->psc_regs->isr_imr.imr, 0=

);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 3 << 4);=

/* reset tx */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 2 << 4);=

/* reset rx */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 1 << 4);=

/* reset mode */

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 4 << 4);=

/* reset error */

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Release irqs */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc_i2s);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.irq, &psc_i2s->ca=

pture);

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback.irq, &psc_i2s->p=

layback);

Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->irq, psc_dma);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->capture.irq, &psc_dma->ca=

pture);

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->playback.irq, &psc_dma->p=

layback);

sound/soc/fsl/mpc5200_dma.c void psc_i2s_shutdown(struct snd_pcm_substream *subst=

Quoted 4 lines

=A0 =A0 =A0 =A0}
=A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -312,7 +312,7 @@ void psc_i2s_shutdown(struct snd_pcm_substream *subst=

ream,

Quoted 6 lines

=A0* interaction with the attached codec
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-static const struct snd_pcm_hardware psc_i2s_pcm_hardware =3D {
+static const struct snd_pcm_hardware psc_dma_pcm_hardware =3D {

=A0 =A0 =A0 =A0.info =3D SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID =

|

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INF=

O_BLOCK_TRANSFER,

Quoted 1 line

=A0 =A0 =A0 =A0.formats =3D SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE=

|

sound/soc/fsl/mpc5200_dma.c static const struct snd_pcm_hardware psc_i2s_pcm_ha=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -329,80 +329,80 @@ static const struct snd_pcm_hardware psc_i2s_pcm_ha=

rdware =3D {

Quoted 7 lines
sound/soc/fsl/mpc5200_dma.c +1 -1
 =A0 =A0 =A0 =A0.fifo_size =A0 =A0 =A0 =A0 =A0 =A0 =A0=3D 0,
 =A0};
 
-static int psc_i2s_pcm_open(struct snd_pcm_substream *substream)
+static int psc_dma_pcm_open(struct snd_pcm_substream *substream)
 =A0{

=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 2 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

+ =A0 =A0 =A0 struct psc_dma_stream *s;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_open(substream=3D%p)\n",=

substream);

Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_pcm_open(substream=3D%p)\n",=

substream);

Quoted 2 lines

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTUR=

E)

Quoted 7 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

- =A0 =A0 =A0 snd_soc_set_runtime_hwparams(substream, &psc_i2s_pcm_hardwa=

re);

Quoted 1 line

+ =A0 =A0 =A0 snd_soc_set_runtime_hwparams(substream, &psc_dma_pcm_hardwa=

re);

Quoted 9 lines

=A0 =A0 =A0 =A0s->stream =3D substream;
=A0 =A0 =A0 =A0return 0;
=A0}

sound/soc/fsl/mpc5200_dma.c +1 -1
-static int psc_i2s_pcm_close(struct snd_pcm_substream *substream)
+static int psc_dma_pcm_close(struct snd_pcm_substream *substream)

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 2 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

+ =A0 =A0 =A0 struct psc_dma_stream *s;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_close(substream=3D%p)\n"=

, substream);

Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_pcm_close(substream=3D%p)\n"=

, substream);

Quoted 2 lines

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTUR=

E)

Quoted 13 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

=A0 =A0 =A0 =A0s->stream =3D NULL;
=A0 =A0 =A0 =A0return 0;
=A0}

=A0static snd_pcm_uframes_t

sound/soc/fsl/mpc5200_dma.c +1 -1
-psc_i2s_pcm_pointer(struct snd_pcm_substream *substream)
+psc_dma_pcm_pointer(struct snd_pcm_substream *substream)
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 2 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_data=

;

Quoted 4 lines

+ =A0 =A0 =A0 struct psc_dma_stream *s;
=A0 =A0 =A0 =A0dma_addr_t count;

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTUR=

E)

Quoted 22 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

=A0 =A0 =A0 =A0count =3D s->period_current_pt - s->period_start;

=A0 =A0 =A0 =A0return bytes_to_frames(substream->runtime, count); =A0}

sound/soc/fsl/mpc5200_dma.c +3 -3
-static struct snd_pcm_ops psc_i2s_pcm_ops =3D {
- =A0 =A0 =A0 .open =A0 =A0 =A0 =A0 =A0 =3D psc_i2s_pcm_open,
- =A0 =A0 =A0 .close =A0 =A0 =A0 =A0 =A0=3D psc_i2s_pcm_close,
+static struct snd_pcm_ops psc_dma_pcm_ops =3D {
+ =A0 =A0 =A0 .open =A0 =A0 =A0 =A0 =A0 =3D psc_dma_pcm_open,
+ =A0 =A0 =A0 .close =A0 =A0 =A0 =A0 =A0=3D psc_dma_pcm_close,

=A0 =A0 =A0 =A0.ioctl =A0 =A0 =A0 =A0 =A0=3D snd_pcm_lib_ioctl,
- =A0 =A0 =A0 .pointer =A0 =A0 =A0 =A0=3D psc_i2s_pcm_pointer,
+ =A0 =A0 =A0 .pointer =A0 =A0 =A0 =A0=3D psc_dma_pcm_pointer, =A0};

sound/soc/fsl/mpc5200_dma.c

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -2
-static u64 psc_i2s_pcm_dmamask =3D 0xffffffff;
-static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *da=

i,

sound/soc/fsl/mpc5200_dma.c

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +2 -0
+static u64 psc_dma_pcm_dmamask =3D 0xffffffff;
+static int psc_dma_pcm_new(struct snd_card *card, struct snd_soc_dai *da=

i,

Quoted 8 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_pcm *pcm) =A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
- =A0 =A0 =A0 size_t size =3D psc_i2s_pcm_hardware.buffer_bytes_max;
+ =A0 =A0 =A0 size_t size =3D psc_dma_pcm_hardware.buffer_bytes_max; =A0 =A0 =A0 =A0int rc =3D 0;

- =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_new(card=3D%p, dai=

=3D%p, pcm=3D%p)\n",

Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_dma_pcm_new(card=3D%p, dai=

=3D%p, pcm=3D%p)\n",

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0card, dai, pcm);

=A0 =A0 =A0 =A0if (!card->dev->dma_mask)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->dma_mask =3D &psc_i2s_pcm_dmamas=

k;

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->dma_mask =3D &psc_dma_pcm_dmamas=

k;

Quoted 2 lines

=A0 =A0 =A0 =A0if (!card->dev->coherent_dma_mask)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0card->dev->coherent_dma_mask =3D 0xfffffff=

f;

sound/soc/fsl/mpc5200_dma.c static int psc_i2s_pcm_new(struct snd_card *card, s=

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -430,13 +430,13 @@ static int psc_i2s_pcm_new(struct snd_card *card, s=

truct snd_soc_dai *dai,

sound/soc/fsl/mpc5200_dma.c static int psc_i2s_pcm_new(struct snd_card *card, s= · line 439

Quoted 11 lines
sound/soc/fsl/mpc5200_dma.c +1 -2
 =A0 =A0 =A0 =A0return -ENOMEM;
 =A0}
 
-static void psc_i2s_pcm_free(struct snd_pcm *pcm)
+static void psc_dma_pcm_free(struct snd_pcm *pcm)
 =A0{
 =A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
 =A0 =A0 =A0 =A0struct snd_pcm_substream *substream;
 =A0 =A0 =A0 =A0int stream;
 
- =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_free(pcm=3D%p)\n", p=

cm);

sound/soc/fsl/mpc5200_dma.c static int psc_i2s_pcm_new(struct snd_card *card, s= · line 439

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +1 -0
+ =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_dma_pcm_free(pcm=3D%p)\n", p=

cm);

Quoted 3 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0 =A0 =A0 =A0for (stream =3D 0; stream < 2; stream++) {

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0substream =3D pcm->streams[stream].substre=

am;

Quoted 22 lines
sound/soc/fsl/mpc5200_dma.c +4 -4
@@ -448,10 +448,10 @@ static void psc_i2s_pcm_free(struct snd_pcm *pcm)
 =A0 =A0 =A0 =A0}
 =A0}
 
-struct snd_soc_platform psc_i2s_pcm_soc_platform =3D {
+struct snd_soc_platform psc_dma_pcm_soc_platform =3D {
 =A0 =A0 =A0 =A0.name =A0 =A0 =A0 =A0 =A0 =3D "mpc5200-psc-audio",
- =A0 =A0 =A0 .pcm_ops =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_ops,
- =A0 =A0 =A0 .pcm_new =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_new,
- =A0 =A0 =A0 .pcm_free =A0 =A0 =A0 =3D &psc_i2s_pcm_free,
+ =A0 =A0 =A0 .pcm_ops =A0 =A0 =A0 =A0=3D &psc_dma_pcm_ops,
+ =A0 =A0 =A0 .pcm_new =A0 =A0 =A0 =A0=3D &psc_dma_pcm_new,
+ =A0 =A0 =A0 .pcm_free =A0 =A0 =A0 =3D &psc_dma_pcm_free,
 =A0};
 
sound/soc/fsl/mpc5200_dma.h +0 -0
index 9a19e8a..a33232c 100644
@@ -6,9 +6,9 @@

=A0#define __SOUND_SOC_FSL_MPC5200_DMA_H__

Quoted 2 lines

=A0/**
- * psc_i2s_stream - Data specific to a single stream (playback or captur=

e)

Quoted 1 line

+ * psc_dma_stream - Data specific to a single stream (playback or captur=

e)

Quoted 1 line

=A0* @active: =A0 =A0 =A0 =A0 =A0 =A0flag indicating if the stream is act=

ive

Quoted 1 line

- * @psc_i2s: =A0 =A0 =A0 =A0 =A0 pointer back to parent psc_i2s data str=

ucture

Quoted 1 line

+ * @psc_dma: =A0 =A0 =A0 =A0 =A0 pointer back to parent psc_dma data str=

ucture

Quoted 5 lines

=A0* @bcom_task: =A0 =A0 =A0 =A0 bestcomm task structure =A0* @irq: =A0 =A0 =A0 =A0 =A0 =A0 =A0 irq number for bestcomm task =A0* @period_start: =A0 =A0 =A0physical address of start of DMA region

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -16,9 +16,9 @@

=A0* @period_next_pt: =A0 =A0physical address of next DMA buffer to enque=

ue

Quoted 45 lines

=A0* @period_bytes: =A0 =A0 =A0size of DMA period in bytes =A0*/

sound/soc/fsl/mpc5200_dma.h +1 -1
-struct psc_i2s_stream {
+struct psc_dma_stream {

=A0 =A0 =A0 =A0int active;
- =A0 =A0 =A0 struct psc_i2s *psc_i2s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma;
=A0 =A0 =A0 =A0struct bcom_task *bcom_task;
=A0 =A0 =A0 =A0int irq;
=A0 =A0 =A0 =A0struct snd_pcm_substream *stream;

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -30,7 +30,7 @@ struct psc_i2s_stream {
 =A0};
 

=A0/**
- * psc_i2s - Private driver data
+ * psc_dma - Private driver data
=A0* @name: short name for this device ("PSC0", "PSC1", etc) =A0* @psc_regs: pointer to the PSC's registers =A0* @fifo_regs: pointer to the PSC's FIFO registers

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -42,7 +42,7 @@ struct psc_i2s_stream {

=A0* @playback: Playback stream context data
=A0* @capture: Capture stream context data
=A0*/

sound/soc/fsl/mpc5200_dma.h +1 -1
-struct psc_i2s {
+struct psc_dma {

=A0 =A0 =A0 =A0char name[32];
=A0 =A0 =A0 =A0struct mpc52xx_psc __iomem *psc_regs; =A0 =A0 =A0 =A0struct mpc52xx_psc_fifo __iomem *fifo_regs;

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -53,8 +53,8 @@ struct psc_i2s {
 =A0 =A0 =A0 =A0u32 sicr;
 

=A0 =A0 =A0 =A0/* per-stream data */
- =A0 =A0 =A0 struct psc_i2s_stream playback;
- =A0 =A0 =A0 struct psc_i2s_stream capture;
+ =A0 =A0 =A0 struct psc_dma_stream playback;
+ =A0 =A0 =A0 struct psc_dma_stream capture;

=A0 =A0 =A0 =A0/* Statistics */
=A0 =A0 =A0 =A0struct {

sound/soc/fsl/mpc5200_dma.h +1 -1
@@ -64,18 +64,18 @@ struct psc_i2s {
 =A0};
 
 
-int psc_i2s_startup(struct snd_pcm_substream *substream,
+int psc_dma_startup(struct snd_pcm_substream *substream,
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai);

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_i2s_hw_free(struct snd_pcm_substream *substream,
+int psc_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai);

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-void psc_i2s_shutdown(struct snd_pcm_substream *substream,
+void psc_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_da=

i *dai);

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
+int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai);

sound/soc/fsl/mpc5200_psc_=

Quoted 6 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-extern struct snd_soc_platform psc_i2s_pcm_soc_platform;
+extern struct snd_soc_platform psc_dma_pcm_soc_platform;

=A0#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */

sound/soc/fsl/mpc5200_psc_= renamed from sound/soc/fsl/mpc5200_psc_i2s.c +0 -0

i2s.c

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substream=

Quoted 4 lines

index 8974b53..12a7917 100644

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -54,10 +54,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substream=

*substream,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct sn=

d_soc_dai *dai)

Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_data=

;

Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_data=

;

Quoted 3 lines

=A0 =A0 =A0 =A0u32 mode;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "%s(substream=3D%p) p_size=3D%i p_byt=

es=3D%i"

Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "%s(substream=3D%p) p_size=3D%i p_byt=

es=3D%i"

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0" periods=3D%i buffer_size=3D%i =A0buffer_=

bytes=3D%i\n",

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0__func__, substream, params_period_size(pa=

rams),

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0params_period_bytes(params), params_period=

s(params),

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substream=

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -77,10 +77,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substream=

*substream,

Quoted 11 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mode =3D MPC52xx_PSC_SICR_SIM_CODEC_32;
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;

=A0 =A0 =A0 =A0default:
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "invalid format\n");
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_dma->dev, "invalid format\n"); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -EINVAL;
=A0 =A0 =A0 =A0}
- =A0 =A0 =A0 out_be32(&psc_i2s->psc_regs->sicr, psc_i2s->sicr | mode);
+ =A0 =A0 =A0 out_be32(&psc_dma->psc_regs->sicr, psc_dma->sicr | mode);

=A0 =A0 =A0 =A0snd_pcm_set_runtime_buffer(substream, &substream->dma_buff=

er);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substream=

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -104,8 +104,8 @@ static int psc_i2s_hw_params(struct snd_pcm_substream=

*substream,

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0int clk_id, un=

signed int freq, int dir)

Quoted 3 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D cpu_dai->private_data;
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_set_sysclk(cpu_dai=3D%p, dir=

=3D%i)\n",

Quoted 2 lines

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D cpu_dai->private_data;
+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_i2s_set_sysclk(cpu_dai=3D%p, dir=

=3D%i)\n",

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cpu_dai, d=

ir);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu=

Quoted 3 lines

=A0 =A0 =A0 =A0return (dir =3D=3D SND_SOC_CLOCK_IN) ? 0 : -EINVAL; =A0}

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -123,8 +123,8 @@ static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu=

_dai,

Quoted 2 lines

=A0*/
=A0static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int f=

ormat)

Quoted 3 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D cpu_dai->private_data;
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_set_fmt(cpu_dai=3D%p, format=

=3D%i)\n",

Quoted 2 lines

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D cpu_dai->private_data;
+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_i2s_set_fmt(cpu_dai=3D%p, format=

=3D%i)\n",

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cpu_dai, f=

ormat);

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_=

Quoted 3 lines

=A0 =A0 =A0 =A0return (format =3D=3D SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL; =A0}

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -140,11 +140,11 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_=

dai, unsigned int format)

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template =3D =

Quoted 16 lines

=A0* psc_i2s_dai_template: template CPU Digital Audio Interface =A0*/
=A0static struct snd_soc_dai_ops psc_i2s_dai_ops =3D {
- =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D psc_i2s_startup,
+ =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D psc_dma_startup, =A0 =A0 =A0 =A0.hw_params =A0 =A0 =A0=3D psc_i2s_hw_params,
- =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D psc_i2s_hw_free,
- =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D psc_i2s_shutdown,
- =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D psc_i2s_trigger,
+ =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D psc_dma_hw_free,
+ =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D psc_dma_shutdown,
+ =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D psc_dma_trigger, =A0 =A0 =A0 =A0.set_sysclk =A0 =A0 =3D psc_i2s_set_sysclk, =A0 =A0 =A0 =A0.set_fmt =A0 =A0 =A0 =A0=3D psc_i2s_set_fmt, =A0};

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -172,24 +172,24 @@ static struct snd_soc_dai psc_i2s_dai_template =3D =

{

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0static ssize_t psc_i2s_status_show(struct device *dev,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct device_attribu=

te *attr, char *buf)

Quoted 5 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(dev);

=A0 =A0 =A0 =A0return sprintf(buf, "status=3D%.4x sicr=3D%.8x rfnum=3D%i =

rfstat=3D0x%.4x "

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"tfnum=3D%i tfstat=3D0x%.4=

x\n",

Quoted 5 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->psc_regs-= sr_csr.status),
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be32(&psc_i2s->psc_regs-= sicr),
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_regs=

->rfnum) & 0x1ff,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_regs=

->rfstat),

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_regs=

->tfnum) & 0x1ff,

Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_regs=

->tfstat));

Quoted 5 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->psc_regs-= sr_csr.status),
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be32(&psc_dma->psc_regs-= sicr),
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_regs=

->rfnum) & 0x1ff,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_regs=

->rfstat),

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_regs=

->tfnum) & 0x1ff,

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_regs=

->tfstat));

Quoted 3 lines

=A0}

-static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *n=

ame)

Quoted 1 line

+static int *psc_i2s_get_stat_attr(struct psc_dma *psc_dma, const char *n=

ame)

sound/soc/fsl/mpc5200_psc_i2s.c static int *psc_i2s_get_stat_attr(struct psc_i2s *p=

Quoted 11 lines

=A0{
=A0 =A0 =A0 =A0if (strcmp(name, "playback_underrun") =3D=3D 0)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_i2s->stats.underrun_count;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_dma->stats.underrun_count; =A0 =A0 =A0 =A0if (strcmp(name, "capture_overrun") =3D=3D 0)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_i2s->stats.overrun_count;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_dma->stats.overrun_count;

=A0 =A0 =A0 =A0return NULL;
=A0}

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -197,10 +197,10 @@ static int *psc_i2s_get_stat_attr(struct psc_i2s *p=

sc_i2s, const char *name)

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0static ssize_t psc_i2s_stat_show(struct device *dev,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct de=

vice_attribute *attr, char *buf)

sound/soc/fsl/mpc5200_psc_i2s.c static ssize_t psc_i2s_stat_store(struct device *de=

Quoted 11 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(dev); =A0 =A0 =A0 =A0int *attrib;

- =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_i2s, attr->attr.name);
+ =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_dma, attr->attr.name); =A0 =A0 =A0 =A0if (!attrib)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return 0;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -212,10 +212,10 @@ static ssize_t psc_i2s_stat_store(struct device *de=

v,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0const =

char *buf,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0size_t=

count)

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_devic=

Quoted 11 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(dev); =A0 =A0 =A0 =A0int *attrib;

- =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_i2s, attr->attr.name);
+ =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_dma, attr->attr.name); =A0 =A0 =A0 =A0if (!attrib)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return 0;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -238,7 +238,7 @@ static int __devinit psc_i2s_of_probe(struct of_devic=

e *op,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =

=A0const struct of_device_id *match)

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_dev=

Quoted 8 lines

=A0{
=A0 =A0 =A0 =A0phys_addr_t fifo;
- =A0 =A0 =A0 struct psc_i2s *psc_i2s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma;
=A0 =A0 =A0 =A0struct resource res;
=A0 =A0 =A0 =A0int size, psc_id, irq, rc;
=A0 =A0 =A0 =A0const __be32 *prop;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -265,56 +265,56 @@ static int __devinit psc_i2s_of_probe(struct of_dev=

ice *op,

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0 =A0 =A0 =A0}
 

=A0 =A0 =A0 =A0/* Allocate and initialize the driver private data */
- =A0 =A0 =A0 psc_i2s =3D kzalloc(sizeof *psc_i2s, GFP_KERNEL);
- =A0 =A0 =A0 if (!psc_i2s) {
+ =A0 =A0 =A0 psc_dma =3D kzalloc(sizeof *psc_dma, GFP_KERNEL);
+ =A0 =A0 =A0 if (!psc_dma) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0iounmap(regs);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -ENOMEM;
=A0 =A0 =A0 =A0}

Quoted 8 lines

- =A0 =A0 =A0 spin_lock_init(&psc_i2s->lock);
- =A0 =A0 =A0 psc_i2s->irq =3D irq;
- =A0 =A0 =A0 psc_i2s->psc_regs =3D regs;
- =A0 =A0 =A0 psc_i2s->fifo_regs =3D regs + sizeof *psc_i2s->psc_regs;
- =A0 =A0 =A0 psc_i2s->dev =3D &op->dev;
- =A0 =A0 =A0 psc_i2s->playback.psc_i2s =3D psc_i2s;
- =A0 =A0 =A0 psc_i2s->capture.psc_i2s =3D psc_i2s;
- =A0 =A0 =A0 snprintf(psc_i2s->name, sizeof psc_i2s->name, "PSC%u", psc_=

id+1);

Quoted 8 lines

+ =A0 =A0 =A0 spin_lock_init(&psc_dma->lock);
+ =A0 =A0 =A0 psc_dma->irq =3D irq;
+ =A0 =A0 =A0 psc_dma->psc_regs =3D regs;
+ =A0 =A0 =A0 psc_dma->fifo_regs =3D regs + sizeof *psc_dma->psc_regs;
+ =A0 =A0 =A0 psc_dma->dev =3D &op->dev;
+ =A0 =A0 =A0 psc_dma->playback.psc_dma =3D psc_dma;
+ =A0 =A0 =A0 psc_dma->capture.psc_dma =3D psc_dma;
+ =A0 =A0 =A0 snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc_=

id+1);

Quoted 3 lines

=A0 =A0 =A0 =A0/* Fill out the CPU DAI structure */
- =A0 =A0 =A0 memcpy(&psc_i2s->dai, &psc_i2s_dai_template, sizeof psc_i2s=

->dai);

Quoted 4 lines

- =A0 =A0 =A0 psc_i2s->dai.private_data =3D psc_i2s;
- =A0 =A0 =A0 psc_i2s->dai.name =3D psc_i2s->name;
- =A0 =A0 =A0 psc_i2s->dai.id =3D psc_id;
+ =A0 =A0 =A0 memcpy(&psc_dma->dai, &psc_i2s_dai_template, sizeof psc_dma=

->dai);

Quoted 5 lines

+ =A0 =A0 =A0 psc_dma->dai.private_data =3D psc_dma;
+ =A0 =A0 =A0 psc_dma->dai.name =3D psc_dma->name;
+ =A0 =A0 =A0 psc_dma->dai.id =3D psc_id;

=A0 =A0 =A0 =A0/* Find the address of the fifo data registers and setup t=

he

Quoted 2 lines

=A0 =A0 =A0 =A0 * DMA tasks */
=A0 =A0 =A0 =A0fifo =3D res.start + offsetof(struct mpc52xx_psc, buffer.b=

uffer_32);

Quoted 3 lines

- =A0 =A0 =A0 psc_i2s->capture.bcom_task =3D
+ =A0 =A0 =A0 psc_dma->capture.bcom_task =3D
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_psc_gen_bd_rx_init(psc_id, 10, fifo, =

512);

Quoted 8 lines

- =A0 =A0 =A0 psc_i2s->playback.bcom_task =3D
+ =A0 =A0 =A0 psc_dma->playback.bcom_task =3D
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_psc_gen_bd_tx_init(psc_id, 10, fifo);
- =A0 =A0 =A0 if (!psc_i2s->capture.bcom_task ||
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->playback.bcom_task) {
+ =A0 =A0 =A0 if (!psc_dma->capture.bcom_task ||
+ =A0 =A0 =A0 =A0 =A0 !psc_dma->playback.bcom_task) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_err(&op->dev, "Could not allocate best=

comm tasks\n");

Quoted 9 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0iounmap(regs);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 kfree(psc_i2s);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 kfree(psc_dma);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -ENODEV;
=A0 =A0 =A0 =A0}

=A0 =A0 =A0 =A0/* Disable all interrupts and reset the PSC */
- =A0 =A0 =A0 out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0);
- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 3 << 4); /* reset transm=

itter */

Quoted 1 line

- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset receiv=

er */

Quoted 1 line

- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 1 << 4); /* reset mode *=

/

Quoted 1 line

- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 4 << 4); /* reset error =

*/

Quoted 2 lines

+ =A0 =A0 =A0 out_be16(&psc_dma->psc_regs->isr_imr.imr, 0);
+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 3 << 4); /* reset transm=

itter */

Quoted 1 line

+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 2 << 4); /* reset receiv=

er */

Quoted 1 line

+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 1 << 4); /* reset mode *=

/

Quoted 1 line

+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error =

*/

Quoted 2 lines

=A0 =A0 =A0 =A0/* Configure the serial interface mode; defaulting to CODE=

C8 mode */

Quoted 1 line

- =A0 =A0 =A0 psc_i2s->sicr =3D MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_=

I2S |

Quoted 1 line

+ =A0 =A0 =A0 psc_dma->sicr =3D MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_=

I2S |

Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0MPC52xx_PSC_SICR_CLKPOL; =A0 =A0 =A0 =A0if (of_get_property(op->node, "fsl,cellslave", NULL))
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->sicr |=3D MPC52xx_PSC_SICR_CELLSLA=

VE |

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma->sicr |=3D MPC52xx_PSC_SICR_CELLSLA=

VE |

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 MPC52xx_P=

SC_SICR_GENCLK;

Quoted 2 lines

- =A0 =A0 =A0 out_be32(&psc_i2s->psc_regs->sicr,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0psc_i2s->sicr | MPC52xx_PSC_SICR_SIM_COD=

EC_8);

Quoted 2 lines

+ =A0 =A0 =A0 out_be32(&psc_dma->psc_regs->sicr,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0psc_dma->sicr | MPC52xx_PSC_SICR_SIM_COD=

EC_8);

Quoted 2 lines

=A0 =A0 =A0 =A0/* Check for the codec handle. =A0If it is not present the=

n we

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_dev=

Quoted 2 lines

=A0 =A0 =A0 =A0 * are done */

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -325,54 +325,54 @@ static int __devinit psc_i2s_of_probe(struct of_dev=

ice *op,

Quoted 18 lines

=A0 =A0 =A0 =A0 * First write: RxRdy (FIFO Alarm) generates rx FIFO irq =A0 =A0 =A0 =A0 * Second write: register Normal mode for non loopback =A0 =A0 =A0 =A0 */
- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->mode, 0);
- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->mode, 0);
+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->mode, 0);
+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->mode, 0);

=A0 =A0 =A0 =A0/* Set the TX and RX fifo alarm thresholds */
- =A0 =A0 =A0 out_be16(&psc_i2s->fifo_regs->rfalarm, 0x100);
- =A0 =A0 =A0 out_8(&psc_i2s->fifo_regs->rfcntl, 0x4);
- =A0 =A0 =A0 out_be16(&psc_i2s->fifo_regs->tfalarm, 0x100);
- =A0 =A0 =A0 out_8(&psc_i2s->fifo_regs->tfcntl, 0x7);
+ =A0 =A0 =A0 out_be16(&psc_dma->fifo_regs->rfalarm, 0x100);
+ =A0 =A0 =A0 out_8(&psc_dma->fifo_regs->rfcntl, 0x4);
+ =A0 =A0 =A0 out_be16(&psc_dma->fifo_regs->tfalarm, 0x100);
+ =A0 =A0 =A0 out_8(&psc_dma->fifo_regs->tfcntl, 0x7);

Quoted 3 lines

=A0 =A0 =A0 =A0/* Lookup the IRQ numbers */
- =A0 =A0 =A0 psc_i2s->playback.irq =3D
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_i2s->playback.bcom_ta=

sk);

Quoted 2 lines

- =A0 =A0 =A0 psc_i2s->capture.irq =3D
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_i2s->capture.bcom_tas=

k);

Quoted 2 lines

+ =A0 =A0 =A0 psc_dma->playback.irq =3D
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_dma->playback.bcom_ta=

sk);

Quoted 2 lines

+ =A0 =A0 =A0 psc_dma->capture.irq =3D
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_dma->capture.bcom_tas=

k);

Quoted 8 lines

=A0 =A0 =A0 =A0/* Save what we've done so it can be found again later */
- =A0 =A0 =A0 dev_set_drvdata(&op->dev, psc_i2s);
+ =A0 =A0 =A0 dev_set_drvdata(&op->dev, psc_dma);

=A0 =A0 =A0 =A0/* Register the SYSFS files */
- =A0 =A0 =A0 rc =3D device_create_file(psc_i2s->dev, &dev_attr_status);
- =A0 =A0 =A0 rc |=3D device_create_file(psc_i2s->dev, &dev_attr_capture_=

overrun);

Quoted 1 line

- =A0 =A0 =A0 rc |=3D device_create_file(psc_i2s->dev, &dev_attr_playback=

_underrun);

Quoted 2 lines

+ =A0 =A0 =A0 rc =3D device_create_file(psc_dma->dev, &dev_attr_status);
+ =A0 =A0 =A0 rc |=3D device_create_file(psc_dma->dev, &dev_attr_capture_=

overrun);

Quoted 1 line

+ =A0 =A0 =A0 rc |=3D device_create_file(psc_dma->dev, &dev_attr_playback=

_underrun);

Quoted 2 lines

=A0 =A0 =A0 =A0if (rc)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_info(psc_i2s->dev, "error creating sysf=

s files\n");

Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_info(psc_dma->dev, "error creating sysf=

s files\n");

Quoted 8 lines

- =A0 =A0 =A0 snd_soc_register_platform(&psc_i2s_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_register_platform(&psc_dma_pcm_soc_platform);

=A0 =A0 =A0 =A0/* Tell the ASoC OF helpers about it */
- =A0 =A0 =A0 of_snd_soc_register_platform(&psc_i2s_pcm_soc_platform, op-= node,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

&psc_i2s->dai);

Quoted 3 lines

+ =A0 =A0 =A0 of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op-= node,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

&psc_dma->dai);

Quoted 27 lines

=A0 =A0 =A0 =A0return 0;
=A0}

=A0static int __devexit psc_i2s_of_remove(struct of_device *op) =A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(&op->dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(&op->dev);

=A0 =A0 =A0 =A0dev_dbg(&op->dev, "psc_i2s_remove()\n");

- =A0 =A0 =A0 snd_soc_unregister_platform(&psc_i2s_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);

- =A0 =A0 =A0 bcom_gen_bd_rx_release(psc_i2s->capture.bcom_task);
- =A0 =A0 =A0 bcom_gen_bd_tx_release(psc_i2s->playback.bcom_task);
+ =A0 =A0 =A0 bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
+ =A0 =A0 =A0 bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);

- =A0 =A0 =A0 iounmap(psc_i2s->psc_regs);
- =A0 =A0 =A0 iounmap(psc_i2s->fifo_regs);
- =A0 =A0 =A0 kfree(psc_i2s);
+ =A0 =A0 =A0 iounmap(psc_dma->psc_regs);
+ =A0 =A0 =A0 iounmap(psc_dma->fifo_regs);
+ =A0 =A0 =A0 kfree(psc_dma);
=A0 =A0 =A0 =A0dev_set_drvdata(&op->dev, NULL);

Quoted 3 lines

=A0 =A0 =A0 =A0return 0;

--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

#5 lore raw

Re: [PATCH V1 2/3] Rename the PSC functions to DMA

Quoted 2 lines · Grant Likely
Quoted 1 line · Jon Smirl

Rename the functions in the mpc5200 DMA file from i2s to dma to reflect =

the file they are in.

Quoted 4 lines
Quoted 2 lines

Okay, I've taken a second look now (as per my comment on 3/3), and yes, I'm still okay with the name changes because the header file scope is restricted. If this header was in include/linux/, then I'd say the prefix should be more specific.

g.

Quoted 4 lines
Quoted 4 lines

---
=A0sound/soc/fsl/mpc5200_dma.c =A0 =A0 | =A0194 ++++++++++++++++++++----=

---------------

Quoted 2 lines
Quoted 2 lines

=A0sound/soc/fsl/mpc5200_dma.h =A0 =A0 | =A0 26 +++-- =A0sound/soc/fsl/mpc5200_psc_i2s.c | =A0160 ++++++++++++++++------------=

----

Quoted 19 lines
Quoted 19 lines

=A03 files changed, 190 insertions(+), 190 deletions(-)

sound/soc/fsl/mpc5200_dma.c +0 -0
index cccaff4..c82ef75 100644
@@ -34,21 +34,21 @@ MODULE_LICENSE("GPL");

=A0/*
=A0* Interrupt handlers
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s)
+static irqreturn_t psc_dma_status_irq(int irq, void *_psc_dma)

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D _psc_i2s;
- =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D _psc_dma;
+ =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_dma->psc_regs; =A0 =A0 =A0 =A0u16 isr;

Quoted 4 lines
Quoted 4 lines

=A0 =A0 =A0 =A0isr =3D in_be16(&regs->mpc52xx_psc_isr);

=A0 =A0 =A0 =A0/* Playback underrun error */
- =A0 =A0 =A0 if (psc_i2s->playback.active && (isr & MPC52xx_PSC_IMR_TXE=

MP))

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.underrun_count++;
+ =A0 =A0 =A0 if (psc_dma->playback.active && (isr & MPC52xx_PSC_IMR_TXE=

MP))

Quoted 4 lines
Quoted 4 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma->stats.underrun_count++;

=A0 =A0 =A0 =A0/* Capture overrun error */
- =A0 =A0 =A0 if (psc_i2s->capture.active && (isr & MPC52xx_PSC_IMR_ORER=

R))

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->stats.overrun_count++;
+ =A0 =A0 =A0 if (psc_dma->capture.active && (isr & MPC52xx_PSC_IMR_ORER=

R))

Quoted 3 lines
Quoted 3 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma->stats.overrun_count++;

=A0 =A0 =A0 =A0out_8(&regs->command, 4 << 4); =A0/* reset the error stat=

us */

Quoted 2 lines

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_status_irq(int irq, void *_=

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -56,7 +56,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_=

psc_i2s)

Quoted 9 lines

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_status_irq(int irq, void *_=

Quoted 9 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_bcom_enqueue_next_buffer - Enqueue another audio buffer
+ * psc_dma_bcom_enqueue_next_buffer - Enqueue another audio buffer =A0* @s: pointer to stream private data structure
=A0*
=A0* Enqueues another audio period buffer into the bestcomm queue.

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -65,7 +65,7 @@ static irqreturn_t psc_i2s_status_irq(int irq, void *_=

psc_i2s)

Quoted 1 line
Quoted 1 line

=A0* the queue. =A0Otherwise the enqueue will fail and the audio ring bu=

ffer

Quoted 8 lines

sound/soc/fsl/mpc5200_dma.c static void psc_i2s_bcom_enqueue_next_buffer(struct ps=

Quoted 8 lines

=A0* will get out of sync
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-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)

=A0{
=A0 =A0 =A0 =A0struct bcom_bd *bd;

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -82,9 +82,9 @@ static void psc_i2s_bcom_enqueue_next_buffer(struct ps=

c_i2s_stream *s)

Quoted 10 lines
Quoted 10 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/* Bestcomm DMA irq handler */

sound/soc/fsl/mpc5200_dma.c +1 -1
-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)

=A0{
- =A0 =A0 =A0 struct psc_i2s_stream *s =3D _psc_i2s_stream;
+ =A0 =A0 =A0 struct psc_dma_stream *s =3D _psc_dma_stream;

=A0 =A0 =A0 =A0/* For each finished period, dequeue the completed period=

buffer

Quoted 2 lines

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_bcom_irq(int irq, void *_ps=

Quoted 2 lines

=A0 =A0 =A0 =A0 * and enqueue a new one in it's place. */

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -93,7 +93,7 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void *_ps=

c_i2s_stream)

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0s->period_current_pt +=3D s->period_bytes=

;

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (s->period_current_pt >=3D s->period_e=

nd)

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0s->period_current_pt =3D =

s->period_start;

Quoted 6 lines

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_i2s_bcom_irq(int irq, void =

Quoted 6 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_buffer(s);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma_bcom_enqueue_next_buffer(s); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_enable(s->bcom_task); =A0 =A0 =A0 =A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -106,39 +106,39 @@ static irqreturn_t psc_i2s_bcom_irq(int irq, void =

*_psc_i2s_stream)

Quoted 9 lines
Quoted 9 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_startup: create a new substream
+ * psc_dma_startup: create a new substream
=A0*
=A0* This is the first function called when a stream is opened. =A0*
=A0* If this is the first stream open, then grab the IRQ and program mos=

t of

Quoted 5 lines
Quoted 5 lines

=A0* the PSC registers.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_i2s_startup(struct snd_pcm_substream *substream,
+int psc_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai)

Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0int rc;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_startup(substream=3D%p)\n",=

substream);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_startup(substream=3D%p)\n",=

substream);

Quoted 7 lines
Quoted 7 lines

- =A0 =A0 =A0 if (!psc_i2s->playback.active &&
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
+ =A0 =A0 =A0 if (!psc_dma->playback.active &&
+ =A0 =A0 =A0 =A0 =A0 !psc_dma->capture.active) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Setup the IRQs */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D request_irq(psc_i2s->irq, &psc_i2s_=

status_irq, IRQF_SHARED,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"psc-i2=

s-status", psc_i2s);

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->capture.irq,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i=

2s_bcom_irq, IRQF_SHARED,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i=

2s-capture", &psc_i2s->capture);

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_i2s->playback.irq,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_i=

2s_bcom_irq, IRQF_SHARED,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-i=

2s-playback", &psc_i2s->playback);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D request_irq(psc_dma->irq, &psc_dma_=

status_irq, IRQF_SHARED,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"psc-dm=

a-status", psc_dma);

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_dma->capture.irq,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_d=

ma_bcom_irq, IRQF_SHARED,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-d=

ma-capture", &psc_dma->capture);

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc |=3D request_irq(psc_dma->playback.irq,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &psc_d=

ma_bcom_irq, IRQF_SHARED,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "psc-d=

ma-playback", &psc_dma->playback);

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (rc) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc=

_i2s);

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.=

irq,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2=

s->capture);

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback=

.irq,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_i2=

s->playback);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->irq, psc=

_dma);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->capture.=

irq,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_dm=

a->capture);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->playback=

.irq,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&psc_dm=

a->playback);

Quoted 4 lines

sound/soc/fsl/mpc5200_dma.c int psc_i2s_startup(struct snd_pcm_substream *substr=

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -ENODEV; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -146,7 +146,7 @@ int psc_i2s_startup(struct snd_pcm_substream *substr=

eam,

Quoted 6 lines
Quoted 6 lines
sound/soc/fsl/mpc5200_dma.c +1 -1
 =A0 =A0 =A0 =A0return 0;
 =A0}
 
-int psc_i2s_hw_free(struct snd_pcm_substream *substream,
+int psc_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai)

Quoted 3 lines

sound/soc/fsl/mpc5200_dma.c int psc_i2s_hw_free(struct snd_pcm_substream *subs=

Quoted 3 lines

=A0{
=A0 =A0 =A0 =A0snd_pcm_set_runtime_buffer(substream, NULL);

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -154,29 +154,29 @@ int psc_i2s_hw_free(struct snd_pcm_substream *subs=

tream,

Quoted 7 lines
Quoted 7 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_trigger: start and stop the DMA transfer.
+ * psc_dma_trigger: start and stop the DMA transfer.
=A0*
=A0* This function is called by ALSA to start, stop, pause, and resume t=

he DMA

Quoted 5 lines
Quoted 5 lines

=A0* transfer of data.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
+int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai)

Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 10 lines
Quoted 10 lines

=A0 =A0 =A0 =A0struct snd_pcm_runtime *runtime =3D substream->runtime;
- =A0 =A0 =A0 struct psc_i2s_stream *s;
- =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_i2s->psc_regs;
+ =A0 =A0 =A0 struct psc_dma_stream *s;
+ =A0 =A0 =A0 struct mpc52xx_psc __iomem *regs =3D psc_dma->psc_regs; =A0 =A0 =A0 =A0u16 imr;
=A0 =A0 =A0 =A0u8 psc_cmd;
=A0 =A0 =A0 =A0unsigned long flags;

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTU=

RE)

Quoted 7 lines
Quoted 7 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_trigger(substream=3D%p, cmd=

=3D%i)"

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_trigger(substream=3D%p, cmd=

=3D%i)"

Quoted 4 lines

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *subs=

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0" stream_id=3D%i\n",
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0substream, cmd, substream->pstr->stream);

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -207,14 +207,14 @@ int psc_i2s_trigger(struct snd_pcm_substream *subs=

tream, int cmd,

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0else
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_gen_bd_tx_reset(s->b=

com_task);

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while (!bcom_queue_full(s->bcom_task))
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s_bcom_enqueue_next_=

buffer(s);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma_bcom_enqueue_next_=

buffer(s);

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_enable(s->bcom_task);

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Due to errata in the i2s mode; need to =

line up enabling

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Due to errata in the dma mode; need to =

line up enabling

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * the transmitter with a transition on t=

he frame sync

Quoted 6 lines
Quoted 6 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * line */

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_lock_irqsave(&psc_i2s->lock, flags);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_lock_irqsave(&psc_dma->lock, flags); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* first make sure it is low */ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while ((in_8(&regs->ipcr_acr.ipcr) & 0x80=

) !=3D 0)

Quoted 2 lines

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *substr=

Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0;

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -228,7 +228,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substr=

eam, int cmd,

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_=

PCM_STREAM_PLAYBACK)

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0psc_cmd |=3D MPC52xx_PSC_=

TX_ENABLE;

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&regs->command, psc_cmd);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_unlock_irqrestore(&psc_i2s->lock, fla=

gs);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 spin_unlock_irqrestore(&psc_dma->lock, fla=

gs);

Quoted 4 lines

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *substr=

Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -236,7 +236,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substr=

eam, int cmd,

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Turn off the PSC */
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0s->active =3D 0;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_=

PCM_STREAM_CAPTURE) {

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->playback.act=

ive) {

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_dma->playback.act=

ive) {

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&re=

gs->command, 2 << 4); =A0/* reset rx */

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&re=

gs->command, 3 << 4); =A0/* reset tx */

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&re=

gs->command, 4 << 4); =A0/* reset err */

Quoted 1 line

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *substr=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -244,7 +244,7 @@ int psc_i2s_trigger(struct snd_pcm_substream *substr=

eam, int cmd,

Quoted 2 lines
Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} else {

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&regs->command, 3 <=

< 4); =A0/* reset tx */

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&regs->command, 4 <=

< 4); =A0/* reset err */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_i2s->capture.acti=

ve)

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!psc_dma->capture.acti=

ve)

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0out_8(&re=

gs->command, 2 << 4); =A0/* reset rx */

Quoted 3 lines

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *subs=

Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -255,15 +255,15 @@ int psc_i2s_trigger(struct snd_pcm_substream *subs=

tream, int cmd,

Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
 

=A0 =A0 =A0 =A0default:
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "invalid command\n")=

;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_dma->dev, "invalid command\n")=

;

Quoted 13 lines
Quoted 13 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -EINVAL;
=A0 =A0 =A0 =A0}

=A0 =A0 =A0 =A0/* Update interrupt enable settings */ =A0 =A0 =A0 =A0imr =3D 0;
- =A0 =A0 =A0 if (psc_i2s->playback.active)
+ =A0 =A0 =A0 if (psc_dma->playback.active)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0imr |=3D MPC52xx_PSC_IMR_TXEMP;
- =A0 =A0 =A0 if (psc_i2s->capture.active)
+ =A0 =A0 =A0 if (psc_dma->capture.active)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0imr |=3D MPC52xx_PSC_IMR_ORERR; =A0 =A0 =A0 =A0out_be16(&regs->isr_imr.imr, imr);

Quoted 1 line

sound/soc/fsl/mpc5200_dma.c int psc_i2s_trigger(struct snd_pcm_substream *subs=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -271,36 +271,36 @@ int psc_i2s_trigger(struct snd_pcm_substream *subs=

tream, int cmd,

Quoted 11 lines
Quoted 11 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0}
 

=A0/**
- * psc_i2s_shutdown: shutdown the data transfer on a stream
+ * psc_dma_shutdown: shutdown the data transfer on a stream =A0*
=A0* Shutdown the PSC if there are no other substreams open. =A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-void psc_i2s_shutdown(struct snd_pcm_substream *substream,
+void psc_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_d=

ai *dai)

Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_shutdown(substream=3D%p)\n"=

, substream);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_shutdown(substream=3D%p)\n"=

, substream);

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0/*
=A0 =A0 =A0 =A0 * If this is the last active substream, disable the PSC =

and release

Quoted 8 lines
Quoted 8 lines

=A0 =A0 =A0 =A0 * the IRQ.
=A0 =A0 =A0 =A0 */
- =A0 =A0 =A0 if (!psc_i2s->playback.active &&
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->capture.active) {
+ =A0 =A0 =A0 if (!psc_dma->playback.active &&
+ =A0 =A0 =A0 =A0 =A0 !psc_dma->capture.active) {

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Disable all interrupts and reset the P=

SC */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_be16(&psc_i2s->psc_regs->isr_imr.imr, =

0);

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 3 << 4)=

; /* reset tx */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 2 << 4)=

; /* reset rx */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 1 << 4)=

; /* reset mode */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 4 << 4)=

; /* reset error */

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_be16(&psc_dma->psc_regs->isr_imr.imr, =

0);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 3 << 4)=

; /* reset tx */

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 2 << 4)=

; /* reset rx */

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 1 << 4)=

; /* reset mode */

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 4 << 4)=

; /* reset error */

Quoted 4 lines
Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Release irqs */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->irq, psc_i2s);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->capture.irq, &psc_i2s->c=

apture);

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_i2s->playback.irq, &psc_i2s->=

playback);

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->irq, psc_dma);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->capture.irq, &psc_dma->c=

apture);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_irq(psc_dma->playback.irq, &psc_dma->=

playback);

Quoted 4 lines

sound/soc/fsl/mpc5200_dma.c void psc_i2s_shutdown(struct snd_pcm_substream *subs=

Quoted 4 lines

=A0 =A0 =A0 =A0}
=A0}

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -312,7 +312,7 @@ void psc_i2s_shutdown(struct snd_pcm_substream *subs=

tream,

Quoted 6 lines
Quoted 6 lines

=A0* interaction with the attached codec
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-static const struct snd_pcm_hardware psc_i2s_pcm_hardware =3D {
+static const struct snd_pcm_hardware psc_dma_pcm_hardware =3D {

=A0 =A0 =A0 =A0.info =3D SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID=

|

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_IN=

FO_BLOCK_TRANSFER,

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0.formats =3D SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_B=

E |

Quoted 1 line

sound/soc/fsl/mpc5200_dma.c static const struct snd_pcm_hardware psc_i2s_pcm_h=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -329,80 +329,80 @@ static const struct snd_pcm_hardware psc_i2s_pcm_h=

ardware =3D {

Quoted 7 lines
Quoted 7 lines
sound/soc/fsl/mpc5200_dma.c +1 -1
 =A0 =A0 =A0 =A0.fifo_size =A0 =A0 =A0 =A0 =A0 =A0 =A0=3D 0,
 =A0};
 
-static int psc_i2s_pcm_open(struct snd_pcm_substream *substream)
+static int psc_dma_pcm_open(struct snd_pcm_substream *substream)
 =A0{

=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 3 lines
Quoted 3 lines

+ =A0 =A0 =A0 struct psc_dma_stream *s;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_open(substream=3D%p)\n"=

, substream);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_pcm_open(substream=3D%p)\n"=

, substream);

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTU=

RE)

Quoted 7 lines
Quoted 7 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

- =A0 =A0 =A0 snd_soc_set_runtime_hwparams(substream, &psc_i2s_pcm_hardw=

are);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 snd_soc_set_runtime_hwparams(substream, &psc_dma_pcm_hardw=

are);

Quoted 9 lines
Quoted 9 lines

=A0 =A0 =A0 =A0s->stream =3D substream;
=A0 =A0 =A0 =A0return 0;
=A0}

sound/soc/fsl/mpc5200_dma.c +1 -1
-static int psc_i2s_pcm_close(struct snd_pcm_substream *substream)
+static int psc_dma_pcm_close(struct snd_pcm_substream *substream)

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 3 lines
Quoted 3 lines

+ =A0 =A0 =A0 struct psc_dma_stream *s;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_pcm_close(substream=3D%p)\n=

", substream);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_dma_pcm_close(substream=3D%p)\n=

", substream);

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTU=

RE)

Quoted 10 lines
Quoted 10 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

=A0 =A0 =A0 =A0s->stream =3D NULL;
=A0 =A0 =A0 =A0return 0;
=A0}

Quoted 5 lines
Quoted 5 lines

=A0static snd_pcm_uframes_t

sound/soc/fsl/mpc5200_dma.c +1 -1
-psc_i2s_pcm_pointer(struct snd_pcm_substream *substream)
+psc_dma_pcm_pointer(struct snd_pcm_substream *substream)

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 struct psc_i2s_stream *s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 4 lines
Quoted 4 lines

+ =A0 =A0 =A0 struct psc_dma_stream *s;
=A0 =A0 =A0 =A0dma_addr_t count;

=A0 =A0 =A0 =A0if (substream->pstr->stream =3D=3D SNDRV_PCM_STREAM_CAPTU=

RE)

Quoted 22 lines
Quoted 22 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->capture;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->capture; =A0 =A0 =A0 =A0else
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_i2s->playback;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 s =3D &psc_dma->playback;

=A0 =A0 =A0 =A0count =3D s->period_current_pt - s->period_start;

=A0 =A0 =A0 =A0return bytes_to_frames(substream->runtime, count); =A0}

sound/soc/fsl/mpc5200_dma.c +3 -3
-static struct snd_pcm_ops psc_i2s_pcm_ops =3D {
- =A0 =A0 =A0 .open =A0 =A0 =A0 =A0 =A0 =3D psc_i2s_pcm_open,
- =A0 =A0 =A0 .close =A0 =A0 =A0 =A0 =A0=3D psc_i2s_pcm_close,
+static struct snd_pcm_ops psc_dma_pcm_ops =3D {
+ =A0 =A0 =A0 .open =A0 =A0 =A0 =A0 =A0 =3D psc_dma_pcm_open,
+ =A0 =A0 =A0 .close =A0 =A0 =A0 =A0 =A0=3D psc_dma_pcm_close,

=A0 =A0 =A0 =A0.ioctl =A0 =A0 =A0 =A0 =A0=3D snd_pcm_lib_ioctl,
- =A0 =A0 =A0 .pointer =A0 =A0 =A0 =A0=3D psc_i2s_pcm_pointer,
+ =A0 =A0 =A0 .pointer =A0 =A0 =A0 =A0=3D psc_dma_pcm_pointer, =A0};

Quoted 2 lines

sound/soc/fsl/mpc5200_dma.c

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -2
-static u64 psc_i2s_pcm_dmamask =3D 0xffffffff;
-static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *d=

ai,

Quoted 2 lines

sound/soc/fsl/mpc5200_dma.c

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +2 -0
+static u64 psc_dma_pcm_dmamask =3D 0xffffffff;
+static int psc_dma_pcm_new(struct snd_card *card, struct snd_soc_dai *d=

ai,

Quoted 8 lines
Quoted 8 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_pcm *pcm) =A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
- =A0 =A0 =A0 size_t size =3D psc_i2s_pcm_hardware.buffer_bytes_max;
+ =A0 =A0 =A0 size_t size =3D psc_dma_pcm_hardware.buffer_bytes_max; =A0 =A0 =A0 =A0int rc =3D 0;

- =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_new(card=3D%p, dai=

=3D%p, pcm=3D%p)\n",

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_dma_pcm_new(card=3D%p, dai=

=3D%p, pcm=3D%p)\n",

Quoted 4 lines
Quoted 4 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0card, dai, pcm);

=A0 =A0 =A0 =A0if (!card->dev->dma_mask)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->dma_mask =3D &psc_i2s_pcm_dmama=

sk;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 card->dev->dma_mask =3D &psc_dma_pcm_dmama=

sk;

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0if (!card->dev->coherent_dma_mask)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0card->dev->coherent_dma_mask =3D 0xffffff=

ff;

Quoted 2 lines

sound/soc/fsl/mpc5200_dma.c static int psc_i2s_pcm_new(struct snd_card *card, =

Quoted 2 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -430,13 +430,13 @@ static int psc_i2s_pcm_new(struct snd_card *card, =

struct snd_soc_dai *dai,

Quoted 11 lines

sound/soc/fsl/mpc5200_dma.c static int psc_i2s_pcm_new(struct snd_card *card, = · line 439

Quoted 11 lines
sound/soc/fsl/mpc5200_dma.c +1 -2
 =A0 =A0 =A0 =A0return -ENOMEM;
 =A0}
 
-static void psc_i2s_pcm_free(struct snd_pcm *pcm)
+static void psc_dma_pcm_free(struct snd_pcm *pcm)
 =A0{
 =A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D pcm->private_data;
 =A0 =A0 =A0 =A0struct snd_pcm_substream *substream;
 =A0 =A0 =A0 =A0int stream;
 
- =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_free(pcm=3D%p)\n", =

pcm);

Quoted 1 line

sound/soc/fsl/mpc5200_dma.c static int psc_i2s_pcm_new(struct snd_card *card, = · line 439

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +1 -0
+ =A0 =A0 =A0 dev_dbg(rtd->socdev->dev, "psc_dma_pcm_free(pcm=3D%p)\n", =

pcm);

Quoted 3 lines
Quoted 3 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
 =A0 =A0 =A0 =A0for (stream =3D 0; stream < 2; stream++) {

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0substream =3D pcm->streams[stream].substr=

eam;

Quoted 22 lines
Quoted 22 lines
sound/soc/fsl/mpc5200_dma.c +4 -4
@@ -448,10 +448,10 @@ static void psc_i2s_pcm_free(struct snd_pcm *pcm)
 =A0 =A0 =A0 =A0}
 =A0}
 
-struct snd_soc_platform psc_i2s_pcm_soc_platform =3D {
+struct snd_soc_platform psc_dma_pcm_soc_platform =3D {
 =A0 =A0 =A0 =A0.name =A0 =A0 =A0 =A0 =A0 =3D "mpc5200-psc-audio",
- =A0 =A0 =A0 .pcm_ops =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_ops,
- =A0 =A0 =A0 .pcm_new =A0 =A0 =A0 =A0=3D &psc_i2s_pcm_new,
- =A0 =A0 =A0 .pcm_free =A0 =A0 =A0 =3D &psc_i2s_pcm_free,
+ =A0 =A0 =A0 .pcm_ops =A0 =A0 =A0 =A0=3D &psc_dma_pcm_ops,
+ =A0 =A0 =A0 .pcm_new =A0 =A0 =A0 =A0=3D &psc_dma_pcm_new,
+ =A0 =A0 =A0 .pcm_free =A0 =A0 =A0 =3D &psc_dma_pcm_free,
 =A0};
 
sound/soc/fsl/mpc5200_dma.h +0 -0
index 9a19e8a..a33232c 100644
@@ -6,9 +6,9 @@

=A0#define __SOUND_SOC_FSL_MPC5200_DMA_H__

Quoted 2 lines
Quoted 2 lines

=A0/**
- * psc_i2s_stream - Data specific to a single stream (playback or captu=

re)

Quoted 1 line
Quoted 1 line

+ * psc_dma_stream - Data specific to a single stream (playback or captu=

re)

Quoted 1 line
Quoted 1 line

=A0* @active: =A0 =A0 =A0 =A0 =A0 =A0flag indicating if the stream is ac=

tive

Quoted 1 line
Quoted 1 line

- * @psc_i2s: =A0 =A0 =A0 =A0 =A0 pointer back to parent psc_i2s data st=

ructure

Quoted 1 line
Quoted 1 line

+ * @psc_dma: =A0 =A0 =A0 =A0 =A0 pointer back to parent psc_dma data st=

ructure

Quoted 5 lines
Quoted 5 lines

=A0* @bcom_task: =A0 =A0 =A0 =A0 bestcomm task structure =A0* @irq: =A0 =A0 =A0 =A0 =A0 =A0 =A0 irq number for bestcomm task =A0* @period_start: =A0 =A0 =A0physical address of start of DMA region

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -16,9 +16,9 @@

=A0* @period_next_pt: =A0 =A0physical address of next DMA buffer to enqu=

eue

Quoted 43 lines
Quoted 43 lines

=A0* @period_bytes: =A0 =A0 =A0size of DMA period in bytes =A0*/

sound/soc/fsl/mpc5200_dma.h +1 -1
-struct psc_i2s_stream {
+struct psc_dma_stream {

=A0 =A0 =A0 =A0int active;
- =A0 =A0 =A0 struct psc_i2s *psc_i2s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma;
=A0 =A0 =A0 =A0struct bcom_task *bcom_task;
=A0 =A0 =A0 =A0int irq;
=A0 =A0 =A0 =A0struct snd_pcm_substream *stream;

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -30,7 +30,7 @@ struct psc_i2s_stream {
 =A0};
 

=A0/**
- * psc_i2s - Private driver data
+ * psc_dma - Private driver data
=A0* @name: short name for this device ("PSC0", "PSC1", etc) =A0* @psc_regs: pointer to the PSC's registers =A0* @fifo_regs: pointer to the PSC's FIFO registers

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -42,7 +42,7 @@ struct psc_i2s_stream {

=A0* @playback: Playback stream context data
=A0* @capture: Capture stream context data
=A0*/

sound/soc/fsl/mpc5200_dma.h +1 -1
-struct psc_i2s {
+struct psc_dma {

=A0 =A0 =A0 =A0char name[32];
=A0 =A0 =A0 =A0struct mpc52xx_psc __iomem *psc_regs; =A0 =A0 =A0 =A0struct mpc52xx_psc_fifo __iomem *fifo_regs;

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -53,8 +53,8 @@ struct psc_i2s {
 =A0 =A0 =A0 =A0u32 sicr;
 

=A0 =A0 =A0 =A0/* per-stream data */
- =A0 =A0 =A0 struct psc_i2s_stream playback;
- =A0 =A0 =A0 struct psc_i2s_stream capture;
+ =A0 =A0 =A0 struct psc_dma_stream playback;
+ =A0 =A0 =A0 struct psc_dma_stream capture;

=A0 =A0 =A0 =A0/* Statistics */
=A0 =A0 =A0 =A0struct {

sound/soc/fsl/mpc5200_dma.h +0 -0
@@ -64,18 +64,18 @@ struct psc_i2s {
 =A0};
 
 
Quoted 3 lines
Quoted 3 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_i2s_startup(struct snd_pcm_substream *substream,
+int psc_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai);

Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_i2s_hw_free(struct snd_pcm_substream *substream,
+int psc_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai);

Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-void psc_i2s_shutdown(struct snd_pcm_substream *substream,
+void psc_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_d=

ai *dai);

Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
+int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai);

Quoted 6 lines

sound/soc/fsl/mpc5200_psc=

Quoted 6 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-extern struct snd_soc_platform psc_i2s_pcm_soc_platform;
+extern struct snd_soc_platform psc_dma_pcm_soc_platform;

=A0#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */

sound/soc/fsl/mpc5200_psc= renamed from sound/soc/fsl/mpc5200_psc_i2s.c +0 -0

_i2s.c

Quoted 4 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea=

Quoted 4 lines

index 8974b53..12a7917 100644

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -54,10 +54,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substrea=

m *substream,

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct s=

nd_soc_dai *dai)

Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D rtd->dai->cpu_dai->private_dat=

a;

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0u32 mode;

- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "%s(substream=3D%p) p_size=3D%i p_by=

tes=3D%i"

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "%s(substream=3D%p) p_size=3D%i p_by=

tes=3D%i"

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0" periods=3D%i buffer_size=3D%i =A0buffer=

_bytes=3D%i\n",

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0__func__, substream, params_period_size(p=

arams),

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0params_period_bytes(params), params_perio=

ds(params),

Quoted 1 line

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea=

Quoted 1 line
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -77,10 +77,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substrea=

m *substream,

Quoted 11 lines
Quoted 11 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mode =3D MPC52xx_PSC_SICR_SIM_CODEC_32;
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;

=A0 =A0 =A0 =A0default:
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "invalid format\n");
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_dbg(psc_dma->dev, "invalid format\n"); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -EINVAL;
=A0 =A0 =A0 =A0}
- =A0 =A0 =A0 out_be32(&psc_i2s->psc_regs->sicr, psc_i2s->sicr | mode);
+ =A0 =A0 =A0 out_be32(&psc_dma->psc_regs->sicr, psc_dma->sicr | mode);

=A0 =A0 =A0 =A0snd_pcm_set_runtime_buffer(substream, &substream->dma_buf=

fer);

Quoted 2 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_hw_params(struct snd_pcm_substrea=

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -104,8 +104,8 @@ static int psc_i2s_hw_params(struct snd_pcm_substrea=

m *substream,

Quoted 2 lines
Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0int clk_id, u=

nsigned int freq, int dir)

Quoted 3 lines
Quoted 3 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D cpu_dai->private_data;
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_set_sysclk(cpu_dai=3D%p, di=

r=3D%i)\n",

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D cpu_dai->private_data;
+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_i2s_set_sysclk(cpu_dai=3D%p, di=

r=3D%i)\n",

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cpu_dai, =

dir);

Quoted 3 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_set_sysclk(struct snd_soc_dai *cp=

Quoted 3 lines

=A0 =A0 =A0 =A0return (dir =3D=3D SND_SOC_CLOCK_IN) ? 0 : -EINVAL; =A0}

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -123,8 +123,8 @@ static int psc_i2s_set_sysclk(struct snd_soc_dai *cp=

u_dai,

Quoted 2 lines
Quoted 2 lines

=A0*/
=A0static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int =

format)

Quoted 3 lines
Quoted 3 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D cpu_dai->private_data;
- =A0 =A0 =A0 dev_dbg(psc_i2s->dev, "psc_i2s_set_fmt(cpu_dai=3D%p, forma=

t=3D%i)\n",

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D cpu_dai->private_data;
+ =A0 =A0 =A0 dev_dbg(psc_dma->dev, "psc_i2s_set_fmt(cpu_dai=3D%p, forma=

t=3D%i)\n",

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cpu_dai, =

format);

Quoted 3 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_set_fmt(struct snd_soc_dai *cpu=

Quoted 3 lines

=A0 =A0 =A0 =A0return (format =3D=3D SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL; =A0}

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -140,11 +140,11 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu=

_dai, unsigned int format)

Quoted 8 lines
Quoted 8 lines

=A0* psc_i2s_dai_template: template CPU Digital Audio Interface =A0*/
=A0static struct snd_soc_dai_ops psc_i2s_dai_ops =3D {
- =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D psc_i2s_startup,
+ =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D psc_dma_startup, =A0 =A0 =A0 =A0.hw_params =A0 =A0 =A0=3D psc_i2s_hw_params,
- =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D psc_i2s_hw_free,
- =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D psc_i2s_shutdown,

Quoted 8 lines

sound/soc/fsl/mpc5200_psc_i2s.c static struct snd_soc_dai psc_i2s_dai_template =3D=

Quoted 8 lines

- =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D psc_i2s_trigger,
+ =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D psc_dma_hw_free,
+ =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D psc_dma_shutdown,
+ =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D psc_dma_trigger, =A0 =A0 =A0 =A0.set_sysclk =A0 =A0 =3D psc_i2s_set_sysclk, =A0 =A0 =A0 =A0.set_fmt =A0 =A0 =A0 =A0=3D psc_i2s_set_fmt, =A0};

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -172,24 +172,24 @@ static struct snd_soc_dai psc_i2s_dai_template =3D=

{

Quoted 2 lines
Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0static ssize_t psc_i2s_status_show(struct device *dev,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct device_attrib=

ute *attr, char *buf)

Quoted 5 lines
Quoted 5 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(dev);

=A0 =A0 =A0 =A0return sprintf(buf, "status=3D%.4x sicr=3D%.8x rfnum=3D%i=

rfstat=3D0x%.4x "

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"tfnum=3D%i tfstat=3D0x%.=

4x\n",

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->psc_regs=

->sr_csr.status),

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be32(&psc_i2s->psc_regs=

->sicr),

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_reg=

s->rfnum) & 0x1ff,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_reg=

s->rfstat),

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_reg=

s->tfnum) & 0x1ff,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_i2s->fifo_reg=

s->tfstat));

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->psc_regs=

->sr_csr.status),

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be32(&psc_dma->psc_regs=

->sicr),

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_reg=

s->rfnum) & 0x1ff,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_reg=

s->rfstat),

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_reg=

s->tfnum) & 0x1ff,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 in_be16(&psc_dma->fifo_reg=

s->tfstat));

Quoted 3 lines
Quoted 3 lines

=A0}

-static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *=

name)

Quoted 1 line
Quoted 1 line

+static int *psc_i2s_get_stat_attr(struct psc_dma *psc_dma, const char *=

name)

Quoted 11 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int *psc_i2s_get_stat_attr(struct psc_i2s *=

Quoted 11 lines

=A0{
=A0 =A0 =A0 =A0if (strcmp(name, "playback_underrun") =3D=3D 0)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_i2s->stats.underrun_count;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_dma->stats.underrun_count; =A0 =A0 =A0 =A0if (strcmp(name, "capture_overrun") =3D=3D 0)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_i2s->stats.overrun_count;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return &psc_dma->stats.overrun_count;

=A0 =A0 =A0 =A0return NULL;
=A0}

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -197,10 +197,10 @@ static int *psc_i2s_get_stat_attr(struct psc_i2s *=

psc_i2s, const char *name)

Quoted 2 lines
Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0static ssize_t psc_i2s_stat_show(struct device *dev,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct d=

evice_attribute *attr, char *buf)

Quoted 6 lines
Quoted 6 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(dev); =A0 =A0 =A0 =A0int *attrib;

- =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_i2s, attr->attr.name)=

;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_dma, attr->attr.name)=

;

Quoted 4 lines

sound/soc/fsl/mpc5200_psc_i2s.c static ssize_t psc_i2s_stat_store(struct device *d=

Quoted 4 lines

=A0 =A0 =A0 =A0if (!attrib)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return 0;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -212,10 +212,10 @@ static ssize_t psc_i2s_stat_store(struct device *d=

ev,

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0const=

char *buf,

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0size_=

t count)

Quoted 6 lines
Quoted 6 lines

=A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(dev); =A0 =A0 =A0 =A0int *attrib;

- =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_i2s, attr->attr.name)=

;

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 attrib =3D psc_i2s_get_stat_attr(psc_dma, attr->attr.name)=

;

Quoted 4 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_devi=

Quoted 4 lines

=A0 =A0 =A0 =A0if (!attrib)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return 0;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -238,7 +238,7 @@ static int __devinit psc_i2s_of_probe(struct of_devi=

ce *op,

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =

=A0const struct of_device_id *match)

Quoted 8 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_de=

Quoted 8 lines

=A0{
=A0 =A0 =A0 =A0phys_addr_t fifo;
- =A0 =A0 =A0 struct psc_i2s *psc_i2s;
+ =A0 =A0 =A0 struct psc_dma *psc_dma;
=A0 =A0 =A0 =A0struct resource res;
=A0 =A0 =A0 =A0int size, psc_id, irq, rc;
=A0 =A0 =A0 =A0const __be32 *prop;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -265,56 +265,56 @@ static int __devinit psc_i2s_of_probe(struct of_de=

vice *op,

Quoted 18 lines
Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0 =A0 =A0 =A0}
 

=A0 =A0 =A0 =A0/* Allocate and initialize the driver private data */
- =A0 =A0 =A0 psc_i2s =3D kzalloc(sizeof *psc_i2s, GFP_KERNEL);
- =A0 =A0 =A0 if (!psc_i2s) {
+ =A0 =A0 =A0 psc_dma =3D kzalloc(sizeof *psc_dma, GFP_KERNEL);
+ =A0 =A0 =A0 if (!psc_dma) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0iounmap(regs);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -ENOMEM;
=A0 =A0 =A0 =A0}

Quoted 8 lines

- =A0 =A0 =A0 spin_lock_init(&psc_i2s->lock);
- =A0 =A0 =A0 psc_i2s->irq =3D irq;
- =A0 =A0 =A0 psc_i2s->psc_regs =3D regs;
- =A0 =A0 =A0 psc_i2s->fifo_regs =3D regs + sizeof *psc_i2s->psc_regs;
- =A0 =A0 =A0 psc_i2s->dev =3D &op->dev;
- =A0 =A0 =A0 psc_i2s->playback.psc_i2s =3D psc_i2s;
- =A0 =A0 =A0 psc_i2s->capture.psc_i2s =3D psc_i2s;
- =A0 =A0 =A0 snprintf(psc_i2s->name, sizeof psc_i2s->name, "PSC%u", psc=

_id+1);

Quoted 8 lines
Quoted 8 lines

+ =A0 =A0 =A0 spin_lock_init(&psc_dma->lock);
+ =A0 =A0 =A0 psc_dma->irq =3D irq;
+ =A0 =A0 =A0 psc_dma->psc_regs =3D regs;
+ =A0 =A0 =A0 psc_dma->fifo_regs =3D regs + sizeof *psc_dma->psc_regs;
+ =A0 =A0 =A0 psc_dma->dev =3D &op->dev;
+ =A0 =A0 =A0 psc_dma->playback.psc_dma =3D psc_dma;
+ =A0 =A0 =A0 psc_dma->capture.psc_dma =3D psc_dma;
+ =A0 =A0 =A0 snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc=

_id+1);

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0/* Fill out the CPU DAI structure */
- =A0 =A0 =A0 memcpy(&psc_i2s->dai, &psc_i2s_dai_template, sizeof psc_i2=

s->dai);

Quoted 4 lines
Quoted 4 lines

- =A0 =A0 =A0 psc_i2s->dai.private_data =3D psc_i2s;
- =A0 =A0 =A0 psc_i2s->dai.name =3D psc_i2s->name;
- =A0 =A0 =A0 psc_i2s->dai.id =3D psc_id;
+ =A0 =A0 =A0 memcpy(&psc_dma->dai, &psc_i2s_dai_template, sizeof psc_dm=

a->dai);

Quoted 5 lines
Quoted 5 lines

+ =A0 =A0 =A0 psc_dma->dai.private_data =3D psc_dma;
+ =A0 =A0 =A0 psc_dma->dai.name =3D psc_dma->name;
+ =A0 =A0 =A0 psc_dma->dai.id =3D psc_id;

=A0 =A0 =A0 =A0/* Find the address of the fifo data registers and setup =

the

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0 * DMA tasks */
=A0 =A0 =A0 =A0fifo =3D res.start + offsetof(struct mpc52xx_psc, buffer.=

buffer_32);

Quoted 3 lines
Quoted 3 lines

- =A0 =A0 =A0 psc_i2s->capture.bcom_task =3D
+ =A0 =A0 =A0 psc_dma->capture.bcom_task =3D
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_psc_gen_bd_rx_init(psc_id, 10, fifo,=

512);

Quoted 3 lines
Quoted 3 lines

- =A0 =A0 =A0 psc_i2s->playback.bcom_task =3D
+ =A0 =A0 =A0 psc_dma->playback.bcom_task =3D
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_psc_gen_bd_tx_init(psc_id, 10, fifo)=

;

Quoted 5 lines
Quoted 5 lines

- =A0 =A0 =A0 if (!psc_i2s->capture.bcom_task ||
- =A0 =A0 =A0 =A0 =A0 !psc_i2s->playback.bcom_task) {
+ =A0 =A0 =A0 if (!psc_dma->capture.bcom_task ||
+ =A0 =A0 =A0 =A0 =A0 !psc_dma->playback.bcom_task) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_err(&op->dev, "Could not allocate bes=

tcomm tasks\n");

Quoted 9 lines
Quoted 9 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0iounmap(regs);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 kfree(psc_i2s);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 kfree(psc_dma);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -ENODEV;
=A0 =A0 =A0 =A0}

=A0 =A0 =A0 =A0/* Disable all interrupts and reset the PSC */
- =A0 =A0 =A0 out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0);
- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 3 << 4); /* reset trans=

mitter */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset recei=

ver */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 1 << 4); /* reset mode =

*/

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->command, 4 << 4); /* reset error=

*/

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 out_be16(&psc_dma->psc_regs->isr_imr.imr, 0);
+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 3 << 4); /* reset trans=

mitter */

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 2 << 4); /* reset recei=

ver */

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 1 << 4); /* reset mode =

*/

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error=

*/

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0/* Configure the serial interface mode; defaulting to COD=

EC8 mode */

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 psc_i2s->sicr =3D MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR=

_I2S |

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 psc_dma->sicr =3D MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR=

_I2S |

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0MPC52xx_PSC_SICR_CLKPOL; =A0 =A0 =A0 =A0if (of_get_property(op->node, "fsl,cellslave", NULL))
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_i2s->sicr |=3D MPC52xx_PSC_SICR_CELLSL=

AVE |

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 psc_dma->sicr |=3D MPC52xx_PSC_SICR_CELLSL=

AVE |

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 MPC52xx_=

PSC_SICR_GENCLK;

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 out_be32(&psc_i2s->psc_regs->sicr,
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0psc_i2s->sicr | MPC52xx_PSC_SICR_SIM_CO=

DEC_8);

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 out_be32(&psc_dma->psc_regs->sicr,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0psc_dma->sicr | MPC52xx_PSC_SICR_SIM_CO=

DEC_8);

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0/* Check for the codec handle. =A0If it is not present th=

en we

Quoted 2 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_de=

Quoted 2 lines

=A0 =A0 =A0 =A0 * are done */

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -325,54 +325,54 @@ static int __devinit psc_i2s_of_probe(struct of_de=

vice *op,

Quoted 18 lines
Quoted 18 lines

=A0 =A0 =A0 =A0 * First write: RxRdy (FIFO Alarm) generates rx FIFO irq =A0 =A0 =A0 =A0 * Second write: register Normal mode for non loopback =A0 =A0 =A0 =A0 */
- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->mode, 0);
- =A0 =A0 =A0 out_8(&psc_i2s->psc_regs->mode, 0);
+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->mode, 0);
+ =A0 =A0 =A0 out_8(&psc_dma->psc_regs->mode, 0);

=A0 =A0 =A0 =A0/* Set the TX and RX fifo alarm thresholds */
- =A0 =A0 =A0 out_be16(&psc_i2s->fifo_regs->rfalarm, 0x100);
- =A0 =A0 =A0 out_8(&psc_i2s->fifo_regs->rfcntl, 0x4);
- =A0 =A0 =A0 out_be16(&psc_i2s->fifo_regs->tfalarm, 0x100);
- =A0 =A0 =A0 out_8(&psc_i2s->fifo_regs->tfcntl, 0x7);
+ =A0 =A0 =A0 out_be16(&psc_dma->fifo_regs->rfalarm, 0x100);
+ =A0 =A0 =A0 out_8(&psc_dma->fifo_regs->rfcntl, 0x4);
+ =A0 =A0 =A0 out_be16(&psc_dma->fifo_regs->tfalarm, 0x100);
+ =A0 =A0 =A0 out_8(&psc_dma->fifo_regs->tfcntl, 0x7);

Quoted 3 lines
Quoted 3 lines

=A0 =A0 =A0 =A0/* Lookup the IRQ numbers */
- =A0 =A0 =A0 psc_i2s->playback.irq =3D
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_i2s->playback.bcom_t=

ask);

Quoted 2 lines
Quoted 2 lines

- =A0 =A0 =A0 psc_i2s->capture.irq =3D
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_i2s->capture.bcom_ta=

sk);

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 psc_dma->playback.irq =3D
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_dma->playback.bcom_t=

ask);

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 psc_dma->capture.irq =3D
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 bcom_get_task_irq(psc_dma->capture.bcom_ta=

sk);

Quoted 8 lines
Quoted 8 lines

=A0 =A0 =A0 =A0/* Save what we've done so it can be found again later */
- =A0 =A0 =A0 dev_set_drvdata(&op->dev, psc_i2s);
+ =A0 =A0 =A0 dev_set_drvdata(&op->dev, psc_dma);

=A0 =A0 =A0 =A0/* Register the SYSFS files */
- =A0 =A0 =A0 rc =3D device_create_file(psc_i2s->dev, &dev_attr_status);
- =A0 =A0 =A0 rc |=3D device_create_file(psc_i2s->dev, &dev_attr_capture=

_overrun);

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 rc |=3D device_create_file(psc_i2s->dev, &dev_attr_playbac=

k_underrun);

Quoted 2 lines
Quoted 2 lines

+ =A0 =A0 =A0 rc =3D device_create_file(psc_dma->dev, &dev_attr_status);
+ =A0 =A0 =A0 rc |=3D device_create_file(psc_dma->dev, &dev_attr_capture=

_overrun);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 rc |=3D device_create_file(psc_dma->dev, &dev_attr_playbac=

k_underrun);

Quoted 2 lines
Quoted 2 lines

=A0 =A0 =A0 =A0if (rc)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_info(psc_i2s->dev, "error creating sys=

fs files\n");

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 dev_info(psc_dma->dev, "error creating sys=

fs files\n");

Quoted 6 lines
Quoted 6 lines

- =A0 =A0 =A0 snd_soc_register_platform(&psc_i2s_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_register_platform(&psc_dma_pcm_soc_platform);

=A0 =A0 =A0 =A0/* Tell the ASoC OF helpers about it */
- =A0 =A0 =A0 of_snd_soc_register_platform(&psc_i2s_pcm_soc_platform, op=

->node,

Quoted 1 line
Quoted 1 line

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =

=A0&psc_i2s->dai);

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op=

->node,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =

=A0&psc_dma->dai);

Quoted 33 lines
Quoted 27 lines

=A0 =A0 =A0 =A0return 0;
=A0}

=A0static int __devexit psc_i2s_of_remove(struct of_device *op) =A0{
- =A0 =A0 =A0 struct psc_i2s *psc_i2s =3D dev_get_drvdata(&op->dev);
+ =A0 =A0 =A0 struct psc_dma *psc_dma =3D dev_get_drvdata(&op->dev);

=A0 =A0 =A0 =A0dev_dbg(&op->dev, "psc_i2s_remove()\n");

- =A0 =A0 =A0 snd_soc_unregister_platform(&psc_i2s_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);

- =A0 =A0 =A0 bcom_gen_bd_rx_release(psc_i2s->capture.bcom_task);
- =A0 =A0 =A0 bcom_gen_bd_tx_release(psc_i2s->playback.bcom_task);
+ =A0 =A0 =A0 bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
+ =A0 =A0 =A0 bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);

- =A0 =A0 =A0 iounmap(psc_i2s->psc_regs);
- =A0 =A0 =A0 iounmap(psc_i2s->fifo_regs);
- =A0 =A0 =A0 kfree(psc_i2s);
+ =A0 =A0 =A0 iounmap(psc_dma->psc_regs);
+ =A0 =A0 =A0 iounmap(psc_dma->fifo_regs);
+ =A0 =A0 =A0 kfree(psc_dma);
=A0 =A0 =A0 =A0dev_set_drvdata(&op->dev, NULL);

Quoted 3 lines

=A0 =A0 =A0 =A0return 0;

Quoted 4 lines

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

author
#6 lore raw

PATCH 3/3 Rename exports in mpc5200_dma.c

In reply to Jon Smirl

Rename the public DMA exports into the global name space so that the DMA code can be built as a module.

---
 sound/soc/fsl/mpc5200_dma.c     |   18 ++++++++++++------
 sound/soc/fsl/mpc5200_dma.h     |   10 +++++-----
 sound/soc/fsl/mpc5200_psc_i2s.c |   14 +++++++-------
 3 files changed, 24 insertions(+), 18 deletions(-)
sound/soc/fsl/mpc5200_dma.c +12 -6
index c82ef75..df73755 100644
@@ -113,7 +113,7 @@ static irqreturn_t psc_dma_bcom_irq(int irq, void *_psc_dma_stream)
  * 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,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,
 			   struct snd_soc_dai *dai)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -145,13 +145,16 @@ int psc_dma_startup(struct snd_pcm_substream *substream,
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(mpc5200_dma_startup);
 
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,
 			   struct snd_soc_dai *dai)
 {
 	snd_pcm_set_runtime_buffer(substream, NULL);
 	return 0;
 }
+EXPORT_SYMBOL_GPL(mpc5200_dma_hw_free);
+
 
 /**
  * psc_dma_trigger: start and stop the DMA transfer.
@@ -159,7 +162,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
  * transfer of data.
  */
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,
 			   struct snd_soc_dai *dai)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -269,13 +272,15 @@ int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(mpc5200_dma_trigger);
+
 
 /**
  * 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,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,
 			     struct snd_soc_dai *dai)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -303,6 +308,7 @@ void psc_dma_shutdown(struct snd_pcm_substream *substream,
 		free_irq(psc_dma->playback.irq, &psc_dma->playback);
 	}
 }
+EXPORT_SYMBOL_GPL(mpc5200_dma_shutdown);
 
 /* ---------------------------------------------------------------------
  * The PSC DMA 'ASoC platform' driver
@@ -448,10 +454,10 @@ static void psc_dma_pcm_free(struct snd_pcm *pcm)
 	}
 }
 
-struct snd_soc_platform psc_dma_pcm_soc_platform = {
+struct snd_soc_platform mpc5200_dma_platform = {
 	.name		= "mpc5200-psc-audio",
 	.pcm_ops	= &psc_dma_pcm_ops,
 	.pcm_new	= &psc_dma_pcm_new,
 	.pcm_free	= &psc_dma_pcm_free,
 };
-
+EXPORT_SYMBOL_GPL(mpc5200_dma_platform);
sound/soc/fsl/mpc5200_dma.h +5 -5
index a33232c..e52b90e 100644
@@ -64,18 +64,18 @@ struct psc_dma {
 };
 
 
-int psc_dma_startup(struct snd_pcm_substream *substream,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,
 			   struct snd_soc_dai *dai);
 
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,
 			   struct snd_soc_dai *dai);
 
-void psc_dma_shutdown(struct snd_pcm_substream *substream,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,
 			     struct snd_soc_dai *dai);
 
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,
 			   struct snd_soc_dai *dai);
 
-extern struct snd_soc_platform psc_dma_pcm_soc_platform;
+extern struct snd_soc_platform mpc5200_dma_platform;
 
 #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */
sound/soc/fsl/mpc5200_psc_i2s.c +7 -7
index 12a7917..a4a439c 100644
@@ -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
  */
 static struct snd_soc_dai_ops psc_i2s_dai_ops = {
-	.startup	= psc_dma_startup,
+	.startup	= mpc5200_dma_startup,
 	.hw_params	= psc_i2s_hw_params,
-	.hw_free	= psc_dma_hw_free,
-	.shutdown	= psc_dma_shutdown,
-	.trigger	= psc_dma_trigger,
+	.hw_free	= mpc5200_dma_hw_free,
+	.shutdown	= mpc5200_dma_shutdown,
+	.trigger	= mpc5200_dma_trigger,
 	.set_sysclk	= psc_i2s_set_sysclk,
 	.set_fmt	= psc_i2s_set_fmt,
 };
@@ -350,10 +350,10 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
 	if (rc)
 		dev_info(psc_dma->dev, "error creating sysfs files\n");
 
-	snd_soc_register_platform(&psc_dma_pcm_soc_platform);
+	snd_soc_register_platform(&mpc5200_dma_platform);
 
 	/* Tell the ASoC OF helpers about it */
-	of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op->node,
+	of_snd_soc_register_platform(&mpc5200_dma_platform, op->node,
 				     &psc_dma->dai);
 
 	return 0;
@@ -365,7 +365,7 @@ static int __devexit psc_i2s_of_remove(struct of_device *op)
 
 	dev_dbg(&op->dev, "psc_i2s_remove()\n");
 
-	snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);
+	snd_soc_unregister_platform(&mpc5200_dma_platform);
 
 	bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
 	bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
#7 lore raw

Re: [PATCH V1 3/3] Rename exports in mpc5200_dma.c

Quoted 1 line · Jon Smirl

Rename the public DMA exports into the global name space so that the DMA =

code can be built as a module.

Quoted 2 lines

Nack. mpc5200_dma is too generic for the global namespace... (in fact, I should also relook at the previous patch; I might need to nack my ack). Some variant of 'mpc5200_psc_snd_dma' would be more appropriate. Even mpc5200_psc_dma is too generic because other non-sound PSC modes can use DMA also.

g.

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_dma_bcom_irq(int irq, void *_p=

Quoted 11 lines

---
=A0sound/soc/fsl/mpc5200_dma.c =A0 =A0 | =A0 18 ++++++++++++------ =A0sound/soc/fsl/mpc5200_dma.h =A0 =A0 | =A0 10 +++++----- =A0sound/soc/fsl/mpc5200_psc_i2s.c | =A0 14 +++++++------- =A03 files changed, 24 insertions(+), 18 deletions(-)

sound/soc/fsl/mpc5200_dma.c +0 -0
index c82ef75..df73755 100644
@@ -113,7 +113,7 @@ static irqreturn_t psc_dma_bcom_irq(int irq, void *_p=

sc_dma_stream)

Quoted 1 line

=A0* If this is the first stream open, then grab the IRQ and program most=

of

Quoted 5 lines

=A0* the PSC registers.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_dma_startup(struct snd_pcm_substream *substream,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai)

Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

sound/soc/fsl/mpc5200_dma.c int psc_dma_startup(struct snd_pcm_substream *subst=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -145,13 +145,16 @@ int psc_dma_startup(struct snd_pcm_substream *subst=

ream,

Quoted 8 lines
sound/soc/fsl/mpc5200_dma.c +2 -1
 =A0 =A0 =A0 =A0return 0;
 =A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_startup);
 
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai)

sound/soc/fsl/mpc5200_dma.c int psc_dma_hw_free(struct snd_pcm_substream *substre=

Quoted 10 lines

=A0{
=A0 =A0 =A0 =A0snd_pcm_set_runtime_buffer(substream, NULL); =A0 =A0 =A0 =A0return 0;
=A0}

sound/soc/fsl/mpc5200_dma.c +2 -0
+EXPORT_SYMBOL_GPL(mpc5200_dma_hw_free);
+

=A0/**
=A0* psc_dma_trigger: start and stop the DMA transfer.

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -159,7 +162,7 @@ int psc_dma_hw_free(struct snd_pcm_substream *substre=

am,

Quoted 1 line

=A0* This function is called by ALSA to start, stop, pause, and resume th=

e DMA

Quoted 5 lines

=A0* transfer of data.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai)

Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

sound/soc/fsl/mpc5200_dma.c int psc_dma_trigger(struct snd_pcm_substream *subst=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -269,13 +272,15 @@ int psc_dma_trigger(struct snd_pcm_substream *subst=

ream, int cmd,

Quoted 13 lines
sound/soc/fsl/mpc5200_dma.c +2 -0
 =A0 =A0 =A0 =A0return 0;
 =A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_trigger);
+
 

=A0/**
=A0* psc_dma_shutdown: shutdown the data transfer on a stream =A0*
=A0* Shutdown the PSC if there are no other substreams open. =A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-void psc_dma_shutdown(struct snd_pcm_substream *substream,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_da=

i *dai)

Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_dat=

a;

sound/soc/fsl/mpc5200_dma.c void psc_dma_shutdown(struct snd_pcm_substream *subst=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -303,6 +308,7 @@ void psc_dma_shutdown(struct snd_pcm_substream *subst=

ream,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0free_irq(psc_dma->playback.irq, &psc_dma->=

playback);

Quoted 5 lines

=A0 =A0 =A0 =A0}
=A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_shutdown);

=A0/* -------------------------------------------------------------------=

--

Quoted 24 lines

=A0* The PSC DMA 'ASoC platform' driver

sound/soc/fsl/mpc5200_dma.c +2 -2
@@ -448,10 +454,10 @@ static void psc_dma_pcm_free(struct snd_pcm *pcm)
 =A0 =A0 =A0 =A0}
 =A0}
 
-struct snd_soc_platform psc_dma_pcm_soc_platform =3D {
+struct snd_soc_platform mpc5200_dma_platform =3D {
 =A0 =A0 =A0 =A0.name =A0 =A0 =A0 =A0 =A0 =3D "mpc5200-psc-audio",
 =A0 =A0 =A0 =A0.pcm_ops =A0 =A0 =A0 =A0=3D &psc_dma_pcm_ops,
 =A0 =A0 =A0 =A0.pcm_new =A0 =A0 =A0 =A0=3D &psc_dma_pcm_new,
 =A0 =A0 =A0 =A0.pcm_free =A0 =A0 =A0 =3D &psc_dma_pcm_free,
 =A0};
-
+EXPORT_SYMBOL_GPL(mpc5200_dma_platform);
sound/soc/fsl/mpc5200_dma.h +1 -1
index a33232c..e52b90e 100644
@@ -64,18 +64,18 @@ struct psc_dma {
 =A0};
 
 
-int psc_dma_startup(struct snd_pcm_substream *substream,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai);

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai);

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-void psc_dma_shutdown(struct snd_pcm_substream *substream,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_da=

i *dai);

Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *d=

ai);

sound/soc/fsl/mpc5200_psc_=

Quoted 6 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-extern struct snd_soc_platform psc_dma_pcm_soc_platform;
+extern struct snd_soc_platform mpc5200_dma_platform;

=A0#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */

sound/soc/fsl/mpc5200_psc_= renamed from sound/soc/fsl/mpc5200_psc_i2s.c +0 -0

i2s.c

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_=

Quoted 4 lines

index 12a7917..a4a439c 100644

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -140,11 +140,11 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_=

dai, unsigned int format)

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_dev=

Quoted 16 lines

=A0* psc_i2s_dai_template: template CPU Digital Audio Interface =A0*/
=A0static struct snd_soc_dai_ops psc_i2s_dai_ops =3D {
- =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D psc_dma_startup,
+ =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D mpc5200_dma_startup, =A0 =A0 =A0 =A0.hw_params =A0 =A0 =A0=3D psc_i2s_hw_params,
- =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D psc_dma_hw_free,
- =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D psc_dma_shutdown,
- =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D psc_dma_trigger,
+ =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D mpc5200_dma_hw_free,
+ =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D mpc5200_dma_shutdown,
+ =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D mpc5200_dma_trigger, =A0 =A0 =A0 =A0.set_sysclk =A0 =A0 =3D psc_i2s_set_sysclk, =A0 =A0 =A0 =A0.set_fmt =A0 =A0 =A0 =A0=3D psc_i2s_set_fmt, =A0};

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -350,10 +350,10 @@ static int __devinit psc_i2s_of_probe(struct of_dev=

ice *op,

Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0 =A0 =A0 =A0if (rc)

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_info(psc_dma->dev, "error creating sys=

fs files\n");

Quoted 8 lines

- =A0 =A0 =A0 snd_soc_register_platform(&psc_dma_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_register_platform(&mpc5200_dma_platform);

=A0 =A0 =A0 =A0/* Tell the ASoC OF helpers about it */
- =A0 =A0 =A0 of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op-= node,
+ =A0 =A0 =A0 of_snd_soc_register_platform(&mpc5200_dma_platform, op->nod=

e,

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &=

psc_dma->dai);

sound/soc/fsl/mpc5200_psc_i2s.c static int __devexit psc_i2s_of_remove(struct of_devi=

Quoted 3 lines

=A0 =A0 =A0 =A0return 0;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -365,7 +365,7 @@ static int __devexit psc_i2s_of_remove(struct of_devi=

ce *op)

sound/soc/fsl/mpc5200_psc_i2s.c static int __devexit psc_i2s_of_remove(struct of_devi= · line 371

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +1 -1
 =A0 =A0 =A0 =A0dev_dbg(&op->dev, "psc_i2s_remove()\n");
 
- =A0 =A0 =A0 snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_unregister_platform(&mpc5200_dma_platform);
 
 =A0 =A0 =A0 =A0bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
 =A0 =A0 =A0 =A0bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
 

--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

author
#8 lore raw

Re: [PATCH V1 3/3] Rename exports in mpc5200_dma.c

Quoted 2 lines · Grant Likely
Quoted 1 line · Jon Smirl

Rename the public DMA exports into the global name space so that the DMA=

code can be built as a module.

Quoted 8 lines
Quoted 2 lines

Nack. =A0mpc5200_dma is too generic for the global namespace... (in fact, I should also relook at the previous patch; I might need to nack my ack). =A0Some variant of 'mpc5200_psc_snd_dma' would be more appropriate. =A0Even mpc5200_psc_dma is too generic because other non-sound PSC modes can use DMA also.

I'll change it to mpc5200_audio_dma and resend this to the series to the alsa list.

Does your stuff still work with these patches? I want to get these mechanical changes in so we can focus on the real changes in my later patches.

Quoted 9 lines

g.

Quoted 6 lines

---
=A0sound/soc/fsl/mpc5200_dma.c =A0 =A0 | =A0 18 ++++++++++++------ =A0sound/soc/fsl/mpc5200_dma.h =A0 =A0 | =A0 10 +++++----- =A0sound/soc/fsl/mpc5200_psc_i2s.c | =A0 14 +++++++------- =A03 files changed, 24 insertions(+), 18 deletions(-)

Quoted 5 lines

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_dma_bcom_irq(int irq, void *_=

Quoted 5 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
index c82ef75..df73755 100644
@@ -113,7 +113,7 @@ static irqreturn_t psc_dma_bcom_irq(int irq, void *_=

psc_dma_stream)

Quoted 1 line
Quoted 1 line

=A0* If this is the first stream open, then grab the IRQ and program mos=

t of

Quoted 5 lines
Quoted 5 lines

=A0* the PSC registers.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_dma_startup(struct snd_pcm_substream *substream,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai)

Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line

sound/soc/fsl/mpc5200_dma.c int psc_dma_startup(struct snd_pcm_substream *subs=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -145,13 +145,16 @@ int psc_dma_startup(struct snd_pcm_substream *subs=

tream,

Quoted 8 lines
Quoted 8 lines
sound/soc/fsl/mpc5200_dma.c +2 -1
 =A0 =A0 =A0 =A0return 0;
 =A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_startup);
 
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai)

Quoted 10 lines

sound/soc/fsl/mpc5200_dma.c int psc_dma_hw_free(struct snd_pcm_substream *substr=

Quoted 10 lines

=A0{
=A0 =A0 =A0 =A0snd_pcm_set_runtime_buffer(substream, NULL); =A0 =A0 =A0 =A0return 0;
=A0}

sound/soc/fsl/mpc5200_dma.c +2 -0
+EXPORT_SYMBOL_GPL(mpc5200_dma_hw_free);
+

=A0/**
=A0* psc_dma_trigger: start and stop the DMA transfer.

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -159,7 +162,7 @@ int psc_dma_hw_free(struct snd_pcm_substream *substr=

eam,

Quoted 1 line
Quoted 1 line

=A0* This function is called by ALSA to start, stop, pause, and resume t=

he DMA

Quoted 5 lines
Quoted 5 lines

=A0* transfer of data.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai)

Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line

sound/soc/fsl/mpc5200_dma.c int psc_dma_trigger(struct snd_pcm_substream *subs=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -269,13 +272,15 @@ int psc_dma_trigger(struct snd_pcm_substream *subs=

tream, int cmd,

Quoted 6 lines
Quoted 6 lines
sound/soc/fsl/mpc5200_dma.c +2 -0
 =A0 =A0 =A0 =A0return 0;
 =A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_trigger);
+
 
Quoted 8 lines
Quoted 8 lines

=A0/**
=A0* psc_dma_shutdown: shutdown the data transfer on a stream =A0*
=A0* Shutdown the PSC if there are no other substreams open. =A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-void psc_dma_shutdown(struct snd_pcm_substream *substream,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_d=

ai *dai)

Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_da=

ta;

Quoted 1 line

sound/soc/fsl/mpc5200_dma.c void psc_dma_shutdown(struct snd_pcm_substream *subs=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -303,6 +308,7 @@ void psc_dma_shutdown(struct snd_pcm_substream *subs=

tream,

Quoted 7 lines
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0free_irq(psc_dma->playback.irq, &psc_dma-=

playback);

Quoted 5 lines

=A0 =A0 =A0 =A0}
=A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_shutdown);

=A0/* ------------------------------------------------------------------=

---

Quoted 22 lines
Quoted 22 lines

=A0* The PSC DMA 'ASoC platform' driver

sound/soc/fsl/mpc5200_dma.c +2 -2
@@ -448,10 +454,10 @@ static void psc_dma_pcm_free(struct snd_pcm *pcm)
 =A0 =A0 =A0 =A0}
 =A0}
 
-struct snd_soc_platform psc_dma_pcm_soc_platform =3D {
+struct snd_soc_platform mpc5200_dma_platform =3D {
 =A0 =A0 =A0 =A0.name =A0 =A0 =A0 =A0 =A0 =3D "mpc5200-psc-audio",
 =A0 =A0 =A0 =A0.pcm_ops =A0 =A0 =A0 =A0=3D &psc_dma_pcm_ops,
 =A0 =A0 =A0 =A0.pcm_new =A0 =A0 =A0 =A0=3D &psc_dma_pcm_new,
 =A0 =A0 =A0 =A0.pcm_free =A0 =A0 =A0 =3D &psc_dma_pcm_free,
 =A0};
-
+EXPORT_SYMBOL_GPL(mpc5200_dma_platform);
sound/soc/fsl/mpc5200_dma.h +0 -0
index a33232c..e52b90e 100644
@@ -64,18 +64,18 @@ struct psc_dma {
 =A0};
 
 
Quoted 3 lines
Quoted 3 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_startup(struct snd_pcm_substream *substream,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai);

Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai);

Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-void psc_dma_shutdown(struct snd_pcm_substream *substream,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_d=

ai *dai);

Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai *=

dai);

Quoted 6 lines

sound/soc/fsl/mpc5200_psc=

Quoted 6 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-extern struct snd_soc_platform psc_dma_pcm_soc_platform;
+extern struct snd_soc_platform mpc5200_dma_platform;

=A0#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */

sound/soc/fsl/mpc5200_psc= renamed from sound/soc/fsl/mpc5200_psc_i2s.c +0 -0

_i2s.c

Quoted 4 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_set_fmt(struct snd_soc_dai *cpu=

Quoted 4 lines

index 12a7917..a4a439c 100644

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -140,11 +140,11 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu=

_dai, unsigned int format)

Quoted 8 lines
Quoted 8 lines

=A0* psc_i2s_dai_template: template CPU Digital Audio Interface =A0*/
=A0static struct snd_soc_dai_ops psc_i2s_dai_ops =3D {
- =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D psc_dma_startup,
+ =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D mpc5200_dma_startup, =A0 =A0 =A0 =A0.hw_params =A0 =A0 =A0=3D psc_i2s_hw_params,
- =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D psc_dma_hw_free,
- =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D psc_dma_shutdown,

Quoted 8 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_de=

Quoted 8 lines

- =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D psc_dma_trigger,
+ =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D mpc5200_dma_hw_free,
+ =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D mpc5200_dma_shutdown,
+ =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D mpc5200_dma_trigger, =A0 =A0 =A0 =A0.set_sysclk =A0 =A0 =3D psc_i2s_set_sysclk, =A0 =A0 =A0 =A0.set_fmt =A0 =A0 =A0 =A0=3D psc_i2s_set_fmt, =A0};

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -350,10 +350,10 @@ static int __devinit psc_i2s_of_probe(struct of_de=

vice *op,

Quoted 2 lines
Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0 =A0 =A0 =A0if (rc)

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_info(psc_dma->dev, "error creating sy=

sfs files\n");

Quoted 6 lines
Quoted 6 lines

- =A0 =A0 =A0 snd_soc_register_platform(&psc_dma_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_register_platform(&mpc5200_dma_platform);

=A0 =A0 =A0 =A0/* Tell the ASoC OF helpers about it */
- =A0 =A0 =A0 of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op=

->node,

Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 of_snd_soc_register_platform(&mpc5200_dma_platform, op->no=

de,

Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =

&psc_dma->dai);

Quoted 3 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devexit psc_i2s_of_remove(struct of_dev=

Quoted 3 lines

=A0 =A0 =A0 =A0return 0;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -365,7 +365,7 @@ static int __devexit psc_i2s_of_remove(struct of_dev=

ice *op)

Quoted 13 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devexit psc_i2s_of_remove(struct of_dev= · line 371

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +1 -1
 =A0 =A0 =A0 =A0dev_dbg(&op->dev, "psc_i2s_remove()\n");
 
- =A0 =A0 =A0 snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_unregister_platform(&mpc5200_dma_platform);
 
 =A0 =A0 =A0 =A0bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
 =A0 =A0 =A0 =A0bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
 
Quoted 4 lines

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

--=20
Jon Smirl
[email protected]

#9 lore raw

Re: [PATCH V1 3/3] Rename exports in mpc5200_dma.c

Quoted 4 lines · Jon Smirl
Quoted 2 lines · Grant Likely
Quoted 1 line · Jon Smirl

Rename the public DMA exports into the global name space so that the DM=

A code can be built as a module.

Quoted 9 lines
Quoted 8 lines
Quoted 2 lines

Nack. =A0mpc5200_dma is too generic for the global namespace... (in fact, I should also relook at the previous patch; I might need to nack my ack). =A0Some variant of 'mpc5200_psc_snd_dma' would be more appropriate. =A0Even mpc5200_psc_dma is too generic because other non-sound PSC modes can use DMA also.

Quoted 6 lines

I'll change it to mpc5200_audio_dma and resend this to the series to the alsa list.

Does your stuff still work with these patches? I want to get these mechanical changes in so we can focus on the real changes in my later patches.

The project changed and I haven't fired up my target in quite a long time. =
:-(

g.

Quoted 10 lines
Quoted 10 lines

g.

Quoted 6 lines

---
=A0sound/soc/fsl/mpc5200_dma.c =A0 =A0 | =A0 18 ++++++++++++------ =A0sound/soc/fsl/mpc5200_dma.h =A0 =A0 | =A0 10 +++++----- =A0sound/soc/fsl/mpc5200_psc_i2s.c | =A0 14 +++++++------- =A03 files changed, 24 insertions(+), 18 deletions(-)

Quoted 5 lines
Quoted 5 lines

sound/soc/fsl/mpc5200_dma.c static irqreturn_t psc_dma_bcom_irq(int irq, void *=

Quoted 5 lines
sound/soc/fsl/mpc5200_dma.c +0 -0
index c82ef75..df73755 100644
@@ -113,7 +113,7 @@ static irqreturn_t psc_dma_bcom_irq(int irq, void *=

_psc_dma_stream)

Quoted 1 line
Quoted 1 line
Quoted 1 line

=A0* If this is the first stream open, then grab the IRQ and program mo=

st of

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

=A0* the PSC registers.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_dma_startup(struct snd_pcm_substream *substream,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai =

*dai)

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_d=

ata;

Quoted 1 line
Quoted 1 line

sound/soc/fsl/mpc5200_dma.c int psc_dma_startup(struct snd_pcm_substream *sub=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -145,13 +145,16 @@ int psc_dma_startup(struct snd_pcm_substream *sub=

stream,

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
sound/soc/fsl/mpc5200_dma.c +2 -1
 =A0 =A0 =A0 =A0return 0;
 =A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_startup);
 
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai =

*dai)

Quoted 10 lines
Quoted 10 lines

sound/soc/fsl/mpc5200_dma.c int psc_dma_hw_free(struct snd_pcm_substream *subst=

Quoted 10 lines

=A0{
=A0 =A0 =A0 =A0snd_pcm_set_runtime_buffer(substream, NULL); =A0 =A0 =A0 =A0return 0;
=A0}

sound/soc/fsl/mpc5200_dma.c +2 -0
+EXPORT_SYMBOL_GPL(mpc5200_dma_hw_free);
+

=A0/**
=A0* psc_dma_trigger: start and stop the DMA transfer.

sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -159,7 +162,7 @@ int psc_dma_hw_free(struct snd_pcm_substream *subst=

ream,

Quoted 1 line
Quoted 1 line
Quoted 1 line

=A0* This function is called by ALSA to start, stop, pause, and resume =

the DMA

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

=A0* transfer of data.
=A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai =

*dai)

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_d=

ata;

Quoted 1 line
Quoted 1 line

sound/soc/fsl/mpc5200_dma.c int psc_dma_trigger(struct snd_pcm_substream *sub=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -269,13 +272,15 @@ int psc_dma_trigger(struct snd_pcm_substream *sub=

stream, int cmd,

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
sound/soc/fsl/mpc5200_dma.c +2 -0
 =A0 =A0 =A0 =A0return 0;
 =A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_trigger);
+
 
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

=A0/**
=A0* psc_dma_shutdown: shutdown the data transfer on a stream =A0*
=A0* Shutdown the PSC if there are no other substreams open. =A0*/

sound/soc/fsl/mpc5200_dma.c +1 -1
-void psc_dma_shutdown(struct snd_pcm_substream *substream,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_=

dai *dai)

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

=A0{
=A0 =A0 =A0 =A0struct snd_soc_pcm_runtime *rtd =3D substream->private_d=

ata;

Quoted 1 line
Quoted 1 line

sound/soc/fsl/mpc5200_dma.c void psc_dma_shutdown(struct snd_pcm_substream *sub=

Quoted 1 line
sound/soc/fsl/mpc5200_dma.c +0 -0
@@ -303,6 +308,7 @@ void psc_dma_shutdown(struct snd_pcm_substream *sub=

stream,

Quoted 1 line
Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0free_irq(psc_dma->playback.irq, &psc_dma=

->playback);

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

=A0 =A0 =A0 =A0}
=A0}
+EXPORT_SYMBOL_GPL(mpc5200_dma_shutdown);

=A0/* -----------------------------------------------------------------=

----

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines

=A0* The PSC DMA 'ASoC platform' driver

sound/soc/fsl/mpc5200_dma.c +2 -2
@@ -448,10 +454,10 @@ static void psc_dma_pcm_free(struct snd_pcm *pcm)
 =A0 =A0 =A0 =A0}
 =A0}
 
-struct snd_soc_platform psc_dma_pcm_soc_platform =3D {
+struct snd_soc_platform mpc5200_dma_platform =3D {
 =A0 =A0 =A0 =A0.name =A0 =A0 =A0 =A0 =A0 =3D "mpc5200-psc-audio",
 =A0 =A0 =A0 =A0.pcm_ops =A0 =A0 =A0 =A0=3D &psc_dma_pcm_ops,
 =A0 =A0 =A0 =A0.pcm_new =A0 =A0 =A0 =A0=3D &psc_dma_pcm_new,
 =A0 =A0 =A0 =A0.pcm_free =A0 =A0 =A0 =3D &psc_dma_pcm_free,
 =A0};
-
+EXPORT_SYMBOL_GPL(mpc5200_dma_platform);
sound/soc/fsl/mpc5200_dma.h +0 -0
index a33232c..e52b90e 100644
@@ -64,18 +64,18 @@ struct psc_dma {
 =A0};
 
 
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_startup(struct snd_pcm_substream *substream,
+int mpc5200_dma_startup(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai =

*dai);

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_hw_free(struct snd_pcm_substream *substream,
+int mpc5200_dma_hw_free(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai =

*dai);

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-void psc_dma_shutdown(struct snd_pcm_substream *substream,
+void mpc5200_dma_shutdown(struct snd_pcm_substream *substream,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_=

dai *dai);

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
+int mpc5200_dma_trigger(struct snd_pcm_substream *substream, int cmd,

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct snd_soc_dai =

*dai);

Quoted 6 lines
Quoted 6 lines

sound/soc/fsl/mpc5200_ps=

Quoted 6 lines
sound/soc/fsl/mpc5200_dma.h +1 -1
-extern struct snd_soc_platform psc_dma_pcm_soc_platform;
+extern struct snd_soc_platform mpc5200_dma_platform;

=A0#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */

sound/soc/fsl/mpc5200_ps= renamed from sound/soc/fsl/mpc5200_psc_i2s.c +0 -0

c_i2s.c

Quoted 4 lines
Quoted 4 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int psc_i2s_set_fmt(struct snd_soc_dai *cp=

Quoted 4 lines

index 12a7917..a4a439c 100644

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -140,11 +140,11 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cp=

u_dai, unsigned int format)

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

=A0* psc_i2s_dai_template: template CPU Digital Audio Interface =A0*/
=A0static struct snd_soc_dai_ops psc_i2s_dai_ops =3D {
- =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D psc_dma_startup,
+ =A0 =A0 =A0 .startup =A0 =A0 =A0 =A0=3D mpc5200_dma_startup, =A0 =A0 =A0 =A0.hw_params =A0 =A0 =A0=3D psc_i2s_hw_params,
- =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D psc_dma_hw_free,
- =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D psc_dma_shutdown,

Quoted 8 lines
Quoted 8 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devinit psc_i2s_of_probe(struct of_d=

Quoted 8 lines

- =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D psc_dma_trigger,
+ =A0 =A0 =A0 .hw_free =A0 =A0 =A0 =A0=3D mpc5200_dma_hw_free,
+ =A0 =A0 =A0 .shutdown =A0 =A0 =A0 =3D mpc5200_dma_shutdown,
+ =A0 =A0 =A0 .trigger =A0 =A0 =A0 =A0=3D mpc5200_dma_trigger, =A0 =A0 =A0 =A0.set_sysclk =A0 =A0 =3D psc_i2s_set_sysclk, =A0 =A0 =A0 =A0.set_fmt =A0 =A0 =A0 =A0=3D psc_i2s_set_fmt, =A0};

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -350,10 +350,10 @@ static int __devinit psc_i2s_of_probe(struct of_d=

evice *op,

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
 =A0 =A0 =A0 =A0if (rc)

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_info(psc_dma->dev, "error creating s=

ysfs files\n");

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

- =A0 =A0 =A0 snd_soc_register_platform(&psc_dma_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_register_platform(&mpc5200_dma_platform);

=A0 =A0 =A0 =A0/* Tell the ASoC OF helpers about it */
- =A0 =A0 =A0 of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, o=

p->node,

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ =A0 =A0 =A0 of_snd_soc_register_platform(&mpc5200_dma_platform, op->n=

ode,

Quoted 1 line
Quoted 1 line
Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=

&psc_dma->dai);

Quoted 3 lines
Quoted 3 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devexit psc_i2s_of_remove(struct of_de=

Quoted 3 lines

=A0 =A0 =A0 =A0return 0;

sound/soc/fsl/mpc5200_psc_i2s.c +0 -0
@@ -365,7 +365,7 @@ static int __devexit psc_i2s_of_remove(struct of_de=

vice *op)

Quoted 20 lines
Quoted 13 lines

sound/soc/fsl/mpc5200_psc_i2s.c static int __devexit psc_i2s_of_remove(struct of_de= · line 371

Quoted 10 lines
sound/soc/fsl/mpc5200_psc_i2s.c +1 -1
 =A0 =A0 =A0 =A0dev_dbg(&op->dev, "psc_i2s_remove()\n");
 
- =A0 =A0 =A0 snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);
+ =A0 =A0 =A0 snd_soc_unregister_platform(&mpc5200_dma_platform);
 
 =A0 =A0 =A0 =A0bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
 =A0 =A0 =A0 =A0bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
 
Quoted 4 lines

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Quoted 4 lines

--
Jon Smirl
[email protected]

--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.