CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8990.c

 /*
  * wm8990.c  --  WM8990 ALSA Soc Audio driver
  *
  * Copyright 2008 Wolfson Microelectronics PLC.
  * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *
  *  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/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 #include <asm/div64.h>
 
 #include "wm8990.h"
 
 /* codec private data */
 struct wm8990_priv {
         enum snd_soc_control_type control_type;
         unsigned int sysclk;
@@ skipping 870 matching lines @@
         {"LOUT", NULL, "LOUT PGA"},
         {"SPKN", NULL, "SPKMIX"},
         {"ROUT", NULL, "ROUT PGA"},
         {"OUT4", NULL, "OUT4MIX"},
         {"ROP", NULL, "ROPMIX"},
         {"RON", NULL, "RONMIX"},
 };
 
 static int wm8990_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8990_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8990_dapm_widgets,
                                   ARRAY_SIZE(wm8990_dapm_widgets));
-
         /* set up the WM8990 audio map */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         return 0;
 }
 
 /* PLL divisors */
 struct _pll_div {
         u32 div2;
         u32 n;
         u32 k;
 };
@@ skipping 231 matching lines @@
                 break;
 
         case SND_SOC_BIAS_PREPARE:
                 /* VMID=2*50k */
                 val = snd_soc_read(codec, WM8990_POWER_MANAGEMENT_1) &
                         ~WM8990_VMID_MODE_MASK;
                 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, val | 0x2);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Enable all output discharge bits */
                         snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |
                                 WM8990_DIS_RLINE | WM8990_DIS_OUT3 |
                                 WM8990_DIS_OUT4 | WM8990_DIS_LOUT |
                                 WM8990_DIS_ROUT);
 
                         /* Enable POBCTRL, SOFT_ST, VMIDTOG and BUFDCOPEN */
                         snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
                                      WM8990_BUFDCOPEN | WM8990_POBCTRL |
                                      WM8990_VMIDTOG);
 
                         /* Delay to allow output caps to discharge */
-                        msleep(msecs_to_jiffies(300));
+                        msleep(300);
 
                         /* Disable VMIDTOG */
                         snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
                                      WM8990_BUFDCOPEN | WM8990_POBCTRL);
 
                         /* disable all output discharge bits */
                         snd_soc_write(codec, WM8990_ANTIPOP1, 0);
 
                         /* Enable outputs */
                         snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00);
 
-                        msleep(msecs_to_jiffies(50));
+                        msleep(50);
 
                         /* Enable VMID at 2x50k */
                         snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02);
 
-                        msleep(msecs_to_jiffies(100));
+                        msleep(100);
 
                         /* Enable VREF */
                         snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03);
 
-                        msleep(msecs_to_jiffies(600));
+                        msleep(600);
 
                         /* Enable BUFIOEN */
                         snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
                                      WM8990_BUFDCOPEN | WM8990_POBCTRL |
                                      WM8990_BUFIOEN);
 
                         /* Disable outputs */
                         snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x3);
 
                         /* disable POBCTRL, SOFT_ST and BUFDCOPEN */
@@ skipping 24 matching lines @@
                 /* mute DAC */
                 val = snd_soc_read(codec, WM8990_DAC_CTRL);
                 snd_soc_write(codec, WM8990_DAC_CTRL, val | WM8990_DAC_MUTE);
 
                 /* Enable any disabled outputs */
                 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03);
 
                 /* Disable VMID */
                 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01);
 
-                msleep(msecs_to_jiffies(300));
+                msleep(300);
 
                 /* Enable all output discharge bits */
                 snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |
                         WM8990_DIS_RLINE | WM8990_DIS_OUT3 |
                         WM8990_DIS_OUT4 | WM8990_DIS_LOUT |
                         WM8990_DIS_ROUT);
 
                 /* Disable VREF */
                 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x0);
 
                 /* disable POBCTRL, SOFT_ST and BUFDCOPEN */
                 snd_soc_write(codec, WM8990_ANTIPOP2, 0x0);
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8990_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
         SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
         SNDRV_PCM_RATE_48000)
 
 #define WM8990_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
@@ skipping 176 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8990_i2c_driver);
 #endif
 }
 module_exit(wm8990_exit);
 
 MODULE_DESCRIPTION("ASoC WM8990 driver");
 MODULE_AUTHOR("Liam Girdwood");
 MODULE_LICENSE("GPL");