CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/samsung/jive_wm8750.c

-/* sound/soc/s3c24xx/jive_wm8750.c
+/* sound/soc/samsung/jive_wm8750.c
  *
  * Copyright 2007,2008 Simtec Electronics
  *
  * Based on sound/soc/pxa/spitz.c
  *      Copyright 2005 Wolfson Microelectronics PLC.
  *      Copyright 2005 Openedhand Ltd.
  *
  * 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/module.h>
-#include <linux/moduleparam.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-
-#include <sound/core.h>
-#include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 
-#include "s3c-dma.h"
 #include "s3c2412-i2s.h"
-
 #include "../codecs/wm8750.h"
 
 static const struct snd_soc_dapm_route audio_map[] = {
         { "Headphone Jack", NULL, "LOUT1" },
         { "Headphone Jack", NULL, "ROUT1" },
         { "Internal Speaker", NULL, "LOUT2" },
         { "Internal Speaker", NULL, "ROUT2" },
         { "LINPUT1", NULL, "Line Input" },
         { "RINPUT1", NULL, "Line Input" },
 };
@@ skipping 63 matching lines @@
         return 0;
 }
 
 static struct snd_soc_ops jive_ops = {
         .hw_params      = jive_hw_params,
 };
 
 static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* These endpoints are not being used. */
-        snd_soc_dapm_nc_pin(codec, "LINPUT2");
-        snd_soc_dapm_nc_pin(codec, "RINPUT2");
-        snd_soc_dapm_nc_pin(codec, "LINPUT3");
-        snd_soc_dapm_nc_pin(codec, "RINPUT3");
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "MONO");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "MONO");
 
         /* Add jive specific widgets */
-        err = snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,
+        err = snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
                                         ARRAY_SIZE(wm8750_dapm_widgets));
         if (err) {
                 printk(KERN_ERR "%s: failed to add widgets (%d)\n",
                        __func__, err);
                 return err;
         }
 
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
 
 static struct snd_soc_dai_link jive_dai = {
         .name           = "wm8750",
         .stream_name    = "WM8750",
         .cpu_dai_name   = "s3c2412-i2s",
         .codec_dai_name = "wm8750-hifi",
-        .platform_name  = "s3c24xx-pcm-audio",
+        .platform_name  = "samsung-audio",
         .codec_name     = "wm8750-codec.0-0x1a",
         .init           = jive_wm8750_init,
         .ops            = &jive_ops,
 };
 
 /* jive audio machine driver */
 static struct snd_soc_card snd_soc_machine_jive = {
         .name           = "Jive",
         .dai_link       = &jive_dai,
         .num_links      = 1,
@@ skipping 27 matching lines @@
 {
         platform_device_unregister(jive_snd_device);
 }
 
 module_init(jive_init);
 module_exit(jive_exit);
 
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("ALSA SoC Jive Audio support");
 MODULE_LICENSE("GPL");