CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/samsung/rx1950_uda1380.c

 /*
  * rx1950.c  --  ALSA Soc Audio Layer
  *
  * Copyright (c) 2010 Vasily Khoruzhick <anarsoul@gmail.com>
  *
  * Based on smdk2440.c and magician.c
  *
  * Authors: Graeme Gregory graeme.gregory@wolfsonmicro.com
  *          Philipp Zabel <philipp.zabel@gmail.com>
  *          Denis Grigoriev <dgreenday@gmail.com>
  *          Vasily Khoruzhick <anarsoul@gmail.com>
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
  *  Free Software Foundation;  either version 2 of the  License, or (at your
  *  option) any later version.
  *
  */
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/platform_device.h>
-#include <linux/i2c.h>
 #include <linux/gpio.h>
-#include <linux/clk.h>
 
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
-#include <sound/uda1380.h>
 #include <sound/jack.h>
 
 #include <plat/regs-iis.h>
-
-#include <mach/regs-clock.h>
-
 #include <asm/mach-types.h>
 
-#include "s3c-dma.h"
 #include "s3c24xx-i2s.h"
-#include "../codecs/uda1380.h"
 
 static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd);
 static int rx1950_startup(struct snd_pcm_substream *substream);
 static int rx1950_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params);
 static int rx1950_spk_power(struct snd_soc_dapm_widget *w,
                                 struct snd_kcontrol *kcontrol, int event);
 
 static unsigned int rates[] = {
         16000,
@@ skipping 37 matching lines @@
 };
 
 /* s3c24xx digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link rx1950_uda1380_dai[] = {
         {
                 .name           = "uda1380",
                 .stream_name    = "UDA1380 Duplex",
                 .cpu_dai_name   = "s3c24xx-iis",
                 .codec_dai_name = "uda1380-hifi",
                 .init           = rx1950_uda1380_init,
-                .platform_name  = "s3c24xx-pcm-audio",
+                .platform_name  = "samsung-audio",
                 .codec_name     = "uda1380-codec.0-001a",
                 .ops            = &rx1950_ops,
         },
 };
 
 static struct snd_soc_card rx1950_asoc = {
         .name = "rx1950",
         .dai_link = rx1950_uda1380_dai,
         .num_links = ARRAY_SIZE(rx1950_uda1380_dai),
 };
@@ skipping 112 matching lines @@
                 S3C24XX_PRESCALE(div, div));
         if (ret < 0)
                 return ret;
 
         return 0;
 }
 
 static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* Add rx1950 specific widgets */
-        err = snd_soc_dapm_new_controls(codec, uda1380_dapm_widgets,
+        err = snd_soc_dapm_new_controls(dapm, uda1380_dapm_widgets,
                                   ARRAY_SIZE(uda1380_dapm_widgets));
 
         if (err)
                 return err;
 
         /* Set up rx1950 specific audio path audio_mapnects */
-        err = snd_soc_dapm_add_routes(codec, audio_map,
+        err = snd_soc_dapm_add_routes(dapm, audio_map,
                                       ARRAY_SIZE(audio_map));
 
         if (err)
                 return err;
 
-        snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-        snd_soc_dapm_enable_pin(codec, "Speaker");
+        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Speaker");
+        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
                 &hp_jack);
 
         snd_soc_jack_add_pins(&hp_jack, ARRAY_SIZE(hp_jack_pins),
                 hp_jack_pins);
 
         snd_soc_jack_add_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
                 hp_jack_gpios);
 
@@ skipping 49 matching lines @@
         gpio_free(S3C2410_GPA(1));
 }
 
 module_init(rx1950_init);
 module_exit(rx1950_exit);
 
 /* Module information */
 MODULE_AUTHOR("Vasily Khoruzhick");
 MODULE_DESCRIPTION("ALSA SoC RX1950");
 MODULE_LICENSE("GPL");