CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/samsung/ac97.c

-/* sound/soc/s3c24xx/s3c-ac97.c
+/* sound/soc/samsung/ac97.c
  *
  * ALSA SoC Audio Layer - S3C AC97 Controller driver
  *      Evolved from s3c2443-ac97.c
  *
  * Copyright (c) 2010 Samsung Electronics Co. Ltd
  *      Author: Jaswinder Singh <jassi.brar@samsung.com>
  *      Credits: Graeme Gregory, Sean Choi
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
-#include <linux/module.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 
 #include <sound/soc.h>
 
+#include <mach/dma.h>
 #include <plat/regs-ac97.h>
-#include <mach/dma.h>
 #include <plat/audio.h>
 
-#include "s3c-dma.h"
-#include "s3c-ac97.h"
+#include "dma.h"
 
 #define AC_CMD_ADDR(x) (x << 16)
 #define AC_CMD_DATA(x) (x & 0xffff)
 
+#define S3C_AC97_DAI_PCM 0
+#define S3C_AC97_DAI_MIC 1
+
 struct s3c_ac97_info {
         struct clk         *ac97_clk;
         void __iomem       *regs;
         struct mutex       lock;
         struct completion  done;
 };
 static struct s3c_ac97_info s3c_ac97;
 
 static struct s3c2410_dma_client s3c_dma_client_out = {
         .name = "AC97 PCMOut"
@@ skipping 72 matching lines @@
         writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
 
         if (!wait_for_completion_timeout(&s3c_ac97.done, HZ))
                 pr_err("AC97: Unable to read!");
 
         stat = readl(s3c_ac97.regs + S3C_AC97_STAT);
         addr = (stat >> 16) & 0x7f;
         data = (stat & 0xffff);
 
         if (addr != reg)
-                pr_err("s3c-ac97: req addr = %02x, rep addr = %02x\n",
+                pr_err("ac97: req addr = %02x, rep addr = %02x\n",
                         reg, addr);
 
         mutex_unlock(&s3c_ac97.lock);
 
         return (unsigned short)data;
 }
 
 static void s3c_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
         unsigned short val)
 {
@@ skipping 191 matching lines @@
         .trigger        = s3c_ac97_trigger,
 };
 
 static struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = {
         .hw_params      = s3c_ac97_hw_mic_params,
         .trigger        = s3c_ac97_mic_trigger,
 };
 
 static struct snd_soc_dai_driver s3c_ac97_dai[] = {
         [S3C_AC97_DAI_PCM] = {
-                .name = "s3c-ac97",
+                .name = "samsung-ac97",
                 .ac97_control = 1,
                 .playback = {
                         .stream_name = "AC97 Playback",
                         .channels_min = 2,
                         .channels_max = 2,
                         .rates = SNDRV_PCM_RATE_8000_48000,
                         .formats = SNDRV_PCM_FMTBIT_S16_LE,},
                 .capture = {
                         .stream_name = "AC97 Capture",
                         .channels_min = 2,
                         .channels_max = 2,
                         .rates = SNDRV_PCM_RATE_8000_48000,
                         .formats = SNDRV_PCM_FMTBIT_S16_LE,},
                 .ops = &s3c_ac97_dai_ops,
         },
         [S3C_AC97_DAI_MIC] = {
-                .name = "s3c-ac97-mic",
+                .name = "samsung-ac97-mic",
                 .ac97_control = 1,
                 .capture = {
                         .stream_name = "AC97 Mic Capture",
                         .channels_min = 1,
                         .channels_max = 1,
                         .rates = SNDRV_PCM_RATE_8000_48000,
                         .formats = SNDRV_PCM_FMTBIT_S16_LE,},
                 .ops = &s3c_ac97_mic_dai_ops,
         },
 };
@@ skipping 35 matching lines @@
                 return -ENXIO;
         }
 
         irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!irq_res) {
                 dev_err(&pdev->dev, "AC97 IRQ not provided!\n");
                 return -ENXIO;
         }
 
         if (!request_mem_region(mem_res->start,
-                                resource_size(mem_res), "s3c-ac97")) {
+                                resource_size(mem_res), "ac97")) {
                 dev_err(&pdev->dev, "Unable to request register region\n");
                 return -EBUSY;
         }
 
         s3c_ac97_pcm_out.channel = dmatx_res->start;
         s3c_ac97_pcm_out.dma_addr = mem_res->start + S3C_AC97_PCM_DATA;
         s3c_ac97_pcm_in.channel = dmarx_res->start;
         s3c_ac97_pcm_in.dma_addr = mem_res->start + S3C_AC97_PCM_DATA;
         s3c_ac97_mic_in.channel = dmamic_res->start;
         s3c_ac97_mic_in.dma_addr = mem_res->start + S3C_AC97_MIC_DATA;
 
         init_completion(&s3c_ac97.done);
         mutex_init(&s3c_ac97.lock);
 
         s3c_ac97.regs = ioremap(mem_res->start, resource_size(mem_res));
         if (s3c_ac97.regs == NULL) {
                 dev_err(&pdev->dev, "Unable to ioremap register region\n");
                 ret = -ENXIO;
                 goto err1;
         }
 
         s3c_ac97.ac97_clk = clk_get(&pdev->dev, "ac97");
         if (IS_ERR(s3c_ac97.ac97_clk)) {
-                dev_err(&pdev->dev, "s3c-ac97 failed to get ac97_clock\n");
+                dev_err(&pdev->dev, "ac97 failed to get ac97_clock\n");
                 ret = -ENODEV;
                 goto err2;
         }
         clk_enable(s3c_ac97.ac97_clk);
 
         if (ac97_pdata->cfg_gpio(pdev)) {
                 dev_err(&pdev->dev, "Unable to configure gpio\n");
                 ret = -EINVAL;
                 goto err3;
         }
 
         ret = request_irq(irq_res->start, s3c_ac97_irq,
                                         IRQF_DISABLED, "AC97", NULL);
         if (ret < 0) {
-                dev_err(&pdev->dev, "s3c-ac97: interrupt request failed.\n");
+                dev_err(&pdev->dev, "ac97: interrupt request failed.\n");
                 goto err4;
         }
 
         ret = snd_soc_register_dais(&pdev->dev, s3c_ac97_dai,
                         ARRAY_SIZE(s3c_ac97_dai));
         if (ret)
                 goto err5;
 
         return 0;
 
@@ skipping 30 matching lines @@
         if (mem_res)
                 release_mem_region(mem_res->start, resource_size(mem_res));
 
         return 0;
 }
 
 static struct platform_driver s3c_ac97_driver = {
         .probe  = s3c_ac97_probe,
         .remove = s3c_ac97_remove,
         .driver = {
-                .name = "s3c-ac97",
+                .name = "samsung-ac97",
                 .owner = THIS_MODULE,
         },
 };
 
 static int __init s3c_ac97_init(void)
 {
         return platform_driver_register(&s3c_ac97_driver);
 }
 module_init(s3c_ac97_init);
 
 static void __exit s3c_ac97_exit(void)
 {
         platform_driver_unregister(&s3c_ac97_driver);
 }
 module_exit(s3c_ac97_exit);
 
 MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>");
 MODULE_DESCRIPTION("AC97 driver for the Samsung SoC");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:s3c-ac97");
+MODULE_ALIAS("platform:samsung-ac97");