CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/raumfeld.c

 /*
  * raumfeld_audio.c  --  SoC audio for Raumfeld audio devices
  *
  * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
  *
  * based on code from:
  *
  *    Wolfson Microelectronics PLC.
  *    Openedhand Ltd.
  *    Liam Girdwood <lrg@slimlogic.co.uk>
  *    Richard Purdie <richard@openedhand.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/i2c.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 
 #include "pxa-ssp.h"
 
 #define GPIO_SPDIF_RESET        (38)
 #define GPIO_MCLK_RESET         (111)
 #define GPIO_CODEC_RESET        (120)
 
 static struct i2c_client *max9486_client;
@@ skipping 109 matching lines @@
 
         return 0;
 }
 
 static struct snd_soc_ops raumfeld_cs4270_ops = {
         .startup = raumfeld_cs4270_startup,
         .shutdown = raumfeld_cs4270_shutdown,
         .hw_params = raumfeld_cs4270_hw_params,
 };
 
-static int raumfeld_line_suspend(struct platform_device *pdev, pm_message_t state)
+static int raumfeld_line_suspend(struct snd_soc_card *card)
 {
         raumfeld_enable_audio(false);
         return 0;
 }
 
-static int raumfeld_line_resume(struct platform_device *pdev)
+static int raumfeld_line_resume(struct snd_soc_card *card)
 {
         raumfeld_enable_audio(true);
         return 0;
 }
 
 /* AK4104 */
 
 static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream,
                                      struct snd_pcm_hw_params *params)
 {
@@ skipping 51 matching lines @@
 }
 
 static struct snd_soc_ops raumfeld_ak4104_ops = {
         .hw_params = raumfeld_ak4104_hw_params,
 };
 
 static struct snd_soc_dai_link raumfeld_dai[] = {
 {
         .name           = "ak4104",
         .stream_name    = "Playback",
-        .cpu_dai_name = "pxa-ssp-dai.1",
-        .codec_dai_name = "ak4104-hifi",
-        .platform_name = "pxa-pcm-audio",
+        .cpu_dai_name   = "pxa-ssp-dai.1",
+        .codec_dai_name = "ak4104-hifi",
+        .platform_name  = "pxa-pcm-audio",
         .ops            = &raumfeld_ak4104_ops,
-        .codec_name = "ak4104-codec.0",
+        .codec_name     = "ak4104-codec.0",
 },
 {
         .name           = "CS4270",
         .stream_name    = "CS4270",
-        .cpu_dai_name = "pxa-ssp-dai.0",
-        .platform_name = "pxa-pcm-audio",
-        .codec_dai_name = "cs4270-hifi",
-        .codec_name = "cs4270-codec.0-0048",
+        .cpu_dai_name   = "pxa-ssp-dai.0",
+        .platform_name  = "pxa-pcm-audio",
+        .codec_dai_name = "cs4270-hifi",
+        .codec_name     = "cs4270-codec.0-0048",
         .ops            = &raumfeld_cs4270_ops,
 },};
 
 static struct snd_soc_card snd_soc_raumfeld = {
         .name           = "Raumfeld",
         .dai_link       = raumfeld_dai,
         .suspend_post   = raumfeld_line_suspend,
         .resume_pre     = raumfeld_line_resume,
         .num_links      = ARRAY_SIZE(raumfeld_dai),
 };
@@ skipping 47 matching lines @@
         gpio_free(GPIO_SPDIF_RESET);
 }
 
 module_init(raumfeld_audio_init);
 module_exit(raumfeld_audio_exit);
 
 /* Module information */
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
 MODULE_DESCRIPTION("Raumfeld audio SoC");
 MODULE_LICENSE("GPL");