ASoC: Rename the PSC functions to DMA

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

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 80 insertions, 80 deletions

diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 8974b53eec9f..12a7917b57b0 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -54,10 +54,10 @@ static int psc_i2s_hw_params(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;
         u32 mode;
 
-        dev_dbg(psc_i2s->dev, "%s(substream=%p) p_size=%i p_bytes=%i"
+        dev_dbg(psc_dma->dev, "%s(substream=%p) p_size=%i p_bytes=%i"
                 " periods=%i buffer_size=%i  buffer_bytes=%i\n",
                 __func__, substream, params_period_size(params),
                 params_period_bytes(params), params_periods(params),
@@ -77,10 +77,10 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream,
                 mode = MPC52xx_PSC_SICR_SIM_CODEC_32;
                 break;
         default:
-                dev_dbg(psc_i2s->dev, "invalid format\n");
+                dev_dbg(psc_dma->dev, "invalid format\n");
                 return -EINVAL;
         }
-        out_be32(&psc_i2s->psc_regs->sicr, psc_i2s->sicr | mode);
+        out_be32(&psc_dma->psc_regs->sicr, psc_dma->sicr | mode);
 
         snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
 
@@ -104,8 +104,8 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream,
 static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
                               int clk_id, unsigned int freq, int dir)
 {
-        struct psc_i2s *psc_i2s = cpu_dai->private_data;
-        dev_dbg(psc_i2s->dev, "psc_i2s_set_sysclk(cpu_dai=%p, dir=%i)\n",
+        struct psc_dma *psc_dma = cpu_dai->private_data;
+        dev_dbg(psc_dma->dev, "psc_i2s_set_sysclk(cpu_dai=%p, dir=%i)\n",
                                 cpu_dai, dir);
         return (dir == SND_SOC_CLOCK_IN) ? 0 : -EINVAL;
 }
@@ -123,8 +123,8 @@ static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
  */
 static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
 {
-        struct psc_i2s *psc_i2s = cpu_dai->private_data;
-        dev_dbg(psc_i2s->dev, "psc_i2s_set_fmt(cpu_dai=%p, format=%i)\n",
+        struct psc_dma *psc_dma = cpu_dai->private_data;
+        dev_dbg(psc_dma->dev, "psc_i2s_set_fmt(cpu_dai=%p, format=%i)\n",
                                 cpu_dai, format);
         return (format == SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL;
 }
@@ -140,11 +140,11 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
  * psc_i2s_dai_template: template CPU Digital Audio Interface
  */
 static struct snd_soc_dai_ops psc_i2s_dai_ops = {
-        .startup        = psc_i2s_startup,
+        .startup        = psc_dma_startup,
         .hw_params      = psc_i2s_hw_params,
-        .hw_free        = psc_i2s_hw_free,
-        .shutdown       = psc_i2s_shutdown,
-        .trigger        = psc_i2s_trigger,
+        .hw_free        = psc_dma_hw_free,
+        .shutdown       = psc_dma_shutdown,
+        .trigger        = psc_dma_trigger,
         .set_sysclk     = psc_i2s_set_sysclk,
         .set_fmt        = psc_i2s_set_fmt,
 };
@@ -172,24 +172,24 @@ static struct snd_soc_dai psc_i2s_dai_template = {
 static ssize_t psc_i2s_status_show(struct device *dev,
                            struct device_attribute *attr, char *buf)
 {
-        struct psc_i2s *psc_i2s = dev_get_drvdata(dev);
+        struct psc_dma *psc_dma = dev_get_drvdata(dev);
 
         return sprintf(buf, "status=%.4x sicr=%.8x rfnum=%i rfstat=0x%.4x "
                         "tfnum=%i tfstat=0x%.4x\n",
-                        in_be16(&psc_i2s->psc_regs->sr_csr.status),
-                        in_be32(&psc_i2s->psc_regs->sicr),
-                        in_be16(&psc_i2s->fifo_regs->rfnum) & 0x1ff,
-                        in_be16(&psc_i2s->fifo_regs->rfstat),
-                        in_be16(&psc_i2s->fifo_regs->tfnum) & 0x1ff,
-                        in_be16(&psc_i2s->fifo_regs->tfstat));
+                        in_be16(&psc_dma->psc_regs->sr_csr.status),
+                        in_be32(&psc_dma->psc_regs->sicr),
+                        in_be16(&psc_dma->fifo_regs->rfnum) & 0x1ff,
+                        in_be16(&psc_dma->fifo_regs->rfstat),
+                        in_be16(&psc_dma->fifo_regs->tfnum) & 0x1ff,
+                        in_be16(&psc_dma->fifo_regs->tfstat));
 }
 
-static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *name)
+static int *psc_i2s_get_stat_attr(struct psc_dma *psc_dma, const char *name)
 {
         if (strcmp(name, "playback_underrun") == 0)
-                return &psc_i2s->stats.underrun_count;
+                return &psc_dma->stats.underrun_count;
         if (strcmp(name, "capture_overrun") == 0)
-                return &psc_i2s->stats.overrun_count;
+                return &psc_dma->stats.overrun_count;
 
         return NULL;
 }
@@ -197,10 +197,10 @@ static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *name)
 static ssize_t psc_i2s_stat_show(struct device *dev,
                                  struct device_attribute *attr, char *buf)
 {
-        struct psc_i2s *psc_i2s = dev_get_drvdata(dev);
+        struct psc_dma *psc_dma = dev_get_drvdata(dev);
         int *attrib;
 
-        attrib = psc_i2s_get_stat_attr(psc_i2s, attr->attr.name);
+        attrib = psc_i2s_get_stat_attr(psc_dma, attr->attr.name);
         if (!attrib)
                 return 0;
 
@@ -212,10 +212,10 @@ static ssize_t psc_i2s_stat_store(struct device *dev,
                                   const char *buf,
                                   size_t count)
 {
-        struct psc_i2s *psc_i2s = dev_get_drvdata(dev);
+        struct psc_dma *psc_dma = dev_get_drvdata(dev);
         int *attrib;
 
-        attrib = psc_i2s_get_stat_attr(psc_i2s, attr->attr.name);
+        attrib = psc_i2s_get_stat_attr(psc_dma, attr->attr.name);
         if (!attrib)
                 return 0;
 
@@ -238,7 +238,7 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
                                       const struct of_device_id *match)
 {
         phys_addr_t fifo;
-        struct psc_i2s *psc_i2s;
+        struct psc_dma *psc_dma;
         struct resource res;
         int size, psc_id, irq, rc;
         const __be32 *prop;
@@ -265,56 +265,56 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
         }
 
         /* Allocate and initialize the driver private data */
-        psc_i2s = kzalloc(sizeof *psc_i2s, GFP_KERNEL);
-        if (!psc_i2s) {
+        psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL);
+        if (!psc_dma) {
                 iounmap(regs);
                 return -ENOMEM;
         }
-        spin_lock_init(&psc_i2s->lock);
-        psc_i2s->irq = irq;
-        psc_i2s->psc_regs = regs;
-        psc_i2s->fifo_regs = regs + sizeof *psc_i2s->psc_regs;
-        psc_i2s->dev = &op->dev;
-        psc_i2s->playback.psc_i2s = psc_i2s;
-        psc_i2s->capture.psc_i2s = psc_i2s;
-        snprintf(psc_i2s->name, sizeof psc_i2s->name, "PSC%u", psc_id+1);
+        spin_lock_init(&psc_dma->lock);
+        psc_dma->irq = irq;
+        psc_dma->psc_regs = regs;
+        psc_dma->fifo_regs = regs + sizeof *psc_dma->psc_regs;
+        psc_dma->dev = &op->dev;
+        psc_dma->playback.psc_dma = psc_dma;
+        psc_dma->capture.psc_dma = psc_dma;
+        snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc_id+1);
 
         /* Fill out the CPU DAI structure */
-        memcpy(&psc_i2s->dai, &psc_i2s_dai_template, sizeof psc_i2s->dai);
-        psc_i2s->dai.private_data = psc_i2s;
-        psc_i2s->dai.name = psc_i2s->name;
-        psc_i2s->dai.id = psc_id;
+        memcpy(&psc_dma->dai, &psc_i2s_dai_template, sizeof psc_dma->dai);
+        psc_dma->dai.private_data = psc_dma;
+        psc_dma->dai.name = psc_dma->name;
+        psc_dma->dai.id = psc_id;
 
         /* Find the address of the fifo data registers and setup the
          * DMA tasks */
         fifo = res.start + offsetof(struct mpc52xx_psc, buffer.buffer_32);
-        psc_i2s->capture.bcom_task =
+        psc_dma->capture.bcom_task =
                 bcom_psc_gen_bd_rx_init(psc_id, 10, fifo, 512);
-        psc_i2s->playback.bcom_task =
+        psc_dma->playback.bcom_task =
                 bcom_psc_gen_bd_tx_init(psc_id, 10, fifo);
-        if (!psc_i2s->capture.bcom_task ||
-            !psc_i2s->playback.bcom_task) {
+        if (!psc_dma->capture.bcom_task ||
+            !psc_dma->playback.bcom_task) {
                 dev_err(&op->dev, "Could not allocate bestcomm tasks\n");
                 iounmap(regs);
-                kfree(psc_i2s);
+                kfree(psc_dma);
                 return -ENODEV;
         }
 
         /* 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 transmitter */
-        out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset receiver */
-        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 transmitter */
+        out_8(&psc_dma->psc_regs->command, 2 << 4); /* reset receiver */
+        out_8(&psc_dma->psc_regs->command, 1 << 4); /* reset mode */
+        out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error */
 
         /* Configure the serial interface mode; defaulting to CODEC8 mode */
-        psc_i2s->sicr = MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_I2S |
+        psc_dma->sicr = MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_I2S |
                         MPC52xx_PSC_SICR_CLKPOL;
         if (of_get_property(op->node, "fsl,cellslave", NULL))
-                psc_i2s->sicr |= MPC52xx_PSC_SICR_CELLSLAVE |
+                psc_dma->sicr |= MPC52xx_PSC_SICR_CELLSLAVE |
                                  MPC52xx_PSC_SICR_GENCLK;
-        out_be32(&psc_i2s->psc_regs->sicr,
-                 psc_i2s->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8);
+        out_be32(&psc_dma->psc_regs->sicr,
+                 psc_dma->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8);
 
         /* Check for the codec handle.  If it is not present then we
          * are done */
@@ -325,54 +325,54 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
          * First write: RxRdy (FIFO Alarm) generates rx FIFO irq
          * Second write: register Normal mode for non loopback
          */
-        out_8(&psc_i2s->psc_regs->mode, 0);
-        out_8(&psc_i2s->psc_regs->mode, 0);
+        out_8(&psc_dma->psc_regs->mode, 0);
+        out_8(&psc_dma->psc_regs->mode, 0);
 
         /* Set the TX and RX fifo alarm thresholds */
-        out_be16(&psc_i2s->fifo_regs->rfalarm, 0x100);
-        out_8(&psc_i2s->fifo_regs->rfcntl, 0x4);
-        out_be16(&psc_i2s->fifo_regs->tfalarm, 0x100);
-        out_8(&psc_i2s->fifo_regs->tfcntl, 0x7);
+        out_be16(&psc_dma->fifo_regs->rfalarm, 0x100);
+        out_8(&psc_dma->fifo_regs->rfcntl, 0x4);
+        out_be16(&psc_dma->fifo_regs->tfalarm, 0x100);
+        out_8(&psc_dma->fifo_regs->tfcntl, 0x7);
 
         /* Lookup the IRQ numbers */
-        psc_i2s->playback.irq =
-                bcom_get_task_irq(psc_i2s->playback.bcom_task);
-        psc_i2s->capture.irq =
-                bcom_get_task_irq(psc_i2s->capture.bcom_task);
+        psc_dma->playback.irq =
+                bcom_get_task_irq(psc_dma->playback.bcom_task);
+        psc_dma->capture.irq =
+                bcom_get_task_irq(psc_dma->capture.bcom_task);
 
         /* Save what we've done so it can be found again later */
-        dev_set_drvdata(&op->dev, psc_i2s);
+        dev_set_drvdata(&op->dev, psc_dma);
 
         /* Register the SYSFS files */
-        rc = device_create_file(psc_i2s->dev, &dev_attr_status);
-        rc |= device_create_file(psc_i2s->dev, &dev_attr_capture_overrun);
-        rc |= device_create_file(psc_i2s->dev, &dev_attr_playback_underrun);
+        rc = device_create_file(psc_dma->dev, &dev_attr_status);
+        rc |= device_create_file(psc_dma->dev, &dev_attr_capture_overrun);
+        rc |= device_create_file(psc_dma->dev, &dev_attr_playback_underrun);
         if (rc)
-                dev_info(psc_i2s->dev, "error creating sysfs files\n");
+                dev_info(psc_dma->dev, "error creating sysfs files\n");
 
-        snd_soc_register_platform(&psc_i2s_pcm_soc_platform);
+        snd_soc_register_platform(&psc_dma_pcm_soc_platform);
 
         /* Tell the ASoC OF helpers about it */
-        of_snd_soc_register_platform(&psc_i2s_pcm_soc_platform, op->node,
-                                     &psc_i2s->dai);
+        of_snd_soc_register_platform(&psc_dma_pcm_soc_platform, op->node,
+                                     &psc_dma->dai);
 
         return 0;
 }
 
 static int __devexit psc_i2s_of_remove(struct of_device *op)
 {
-        struct psc_i2s *psc_i2s = dev_get_drvdata(&op->dev);
+        struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
 
         dev_dbg(&op->dev, "psc_i2s_remove()\n");
 
-        snd_soc_unregister_platform(&psc_i2s_pcm_soc_platform);
+        snd_soc_unregister_platform(&psc_dma_pcm_soc_platform);
 
-        bcom_gen_bd_rx_release(psc_i2s->capture.bcom_task);
-        bcom_gen_bd_tx_release(psc_i2s->playback.bcom_task);
+        bcom_gen_bd_rx_release(psc_dma->capture.bcom_task);
+        bcom_gen_bd_tx_release(psc_dma->playback.bcom_task);
 
-        iounmap(psc_i2s->psc_regs);
-        iounmap(psc_i2s->fifo_regs);
-        kfree(psc_i2s);
+        iounmap(psc_dma->psc_regs);
+        iounmap(psc_dma->fifo_regs);
+        kfree(psc_dma);
         dev_set_drvdata(&op->dev, NULL);
 
         return 0;