CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/zylonite.c

 /*
  * zylonite.c  --  SoC audio for Zylonite
  *
  * Copyright 2008 Wolfson Microelectronics PLC.
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.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/device.h>
 #include <linux/clk.h>
 #include <linux/i2c.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include "../codecs/wm9713.h"
 #include "pxa2xx-ac97.h"
 #include "pxa-ssp.h"
 
 /*
  * There is a physical switch SW15 on the board which changes the MCLK
  * for the WM9713 between the standard AC97 master clock and the
  * output of the CLK_POUT signal from the PXA.
  */
@@ skipping 32 matching lines @@
         { "Mic Bias", NULL, "Handset Microphone" },
 
         /* Multiactor differentially connected over SPKL/SPKR */
         { "Multiactor", NULL, "SPKL" },
         { "Multiactor", NULL, "SPKR" },
 };
 
 static int zylonite_wm9713_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         if (clk_pout)
                 snd_soc_dai_set_pll(rtd->codec_dai, 0, 0,
                                     clk_get_rate(pout), 0);
 
-        snd_soc_dapm_new_controls(codec, zylonite_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, zylonite_dapm_widgets,
                                   ARRAY_SIZE(zylonite_dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         /* Static setup for now */
-        snd_soc_dapm_enable_pin(codec, "Headphone");
-        snd_soc_dapm_enable_pin(codec, "Headset Earpiece");
+        snd_soc_dapm_enable_pin(dapm, "Headphone");
+        snd_soc_dapm_enable_pin(dapm, "Headset Earpiece");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
         return 0;
 }
 
 static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
                                     struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         unsigned int pll_out = 0;
@@ skipping 81 matching lines @@
         .name = "WM9713 Voice",
         .stream_name = "WM9713 Voice",
         .codec_name = "wm9713-codec",
         .platform_name = "pxa-pcm-audio",
         .cpu_dai_name = "pxa-ssp-dai.2",
         .codec_name = "wm9713-voice",
         .ops = &zylonite_voice_ops,
 },
 };
 
-static int zylonite_probe(struct platform_device *pdev)
+static int zylonite_probe(struct snd_soc_card *card)
 {
         int ret;
 
         if (clk_pout) {
                 pout = clk_get(NULL, "CLK_POUT");
                 if (IS_ERR(pout)) {
                         dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n",
                                 PTR_ERR(pout));
                         return PTR_ERR(pout);
                 }
 
                 ret = clk_enable(pout);
                 if (ret != 0) {
                         dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
                                 ret);
                         clk_put(pout);
                         return ret;
                 }
 
                 dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",
                         clk_get_rate(pout));
         }
 
         return 0;
 }
 
-static int zylonite_remove(struct platform_device *pdev)
+static int zylonite_remove(struct snd_soc_card *card)
 {
         if (clk_pout) {
                 clk_disable(pout);
                 clk_put(pout);
         }
 
         return 0;
 }
 
-static int zylonite_suspend_post(struct platform_device *pdev,
-                                 pm_message_t state)
+static int zylonite_suspend_post(struct snd_soc_card *card)
 {
         if (clk_pout)
                 clk_disable(pout);
 
         return 0;
 }
 
-static int zylonite_resume_pre(struct platform_device *pdev)
+static int zylonite_resume_pre(struct snd_soc_card *card)
 {
         int ret = 0;
 
         if (clk_pout) {
                 ret = clk_enable(pout);
                 if (ret != 0)
                         dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
                                 ret);
         }
 
@@ skipping 34 matching lines @@
 {
         platform_device_unregister(zylonite_snd_ac97_device);
 }
 
 module_init(zylonite_init);
 module_exit(zylonite_exit);
 
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_DESCRIPTION("ALSA SoC WM9713 Zylonite");
 MODULE_LICENSE("GPL");