CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8741.c

 /*
  * wm8741.c  --  WM8741 ALSA SoC Audio driver
  *
  * Copyright 2010 Wolfson Microelectronics plc
  *
  * Author: Ian Lartey <ian@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 version 2 as
  * published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.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 "wm8741.h"
 
 #define WM8741_NUM_SUPPLIES 2
 static const char *wm8741_supply_names[WM8741_NUM_SUPPLIES] = {
         "AVDD",
         "DVDD",
 };
@@ skipping 49 matching lines @@
 
 static const struct snd_soc_dapm_route intercon[] = {
         { "VOUTLP", NULL, "DACL" },
         { "VOUTLN", NULL, "DACL" },
         { "VOUTRP", NULL, "DACR" },
         { "VOUTRN", NULL, "DACR" },
 };
 
 static int wm8741_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8741_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8741_dapm_widgets,
                                   ARRAY_SIZE(wm8741_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
         return 0;
 }
 
 static struct {
         int value;
         int ratio;
 } lrclk_ratios[WM8741_NUM_RATES] = {
         { 1, 128 },
         { 2, 192 },
@@ skipping 303 matching lines @@
         return 0;
 }
 #else
 #define wm8741_suspend NULL
 #define wm8741_resume NULL
 #endif
 
 static int wm8741_probe(struct snd_soc_codec *codec)
 {
         struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec);
-        u16 *reg_cache = codec->reg_cache;
         int ret = 0;
 
         ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8741->control_type);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
         ret = wm8741_reset(codec);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to issue reset\n");
                 return ret;
         }
 
         /* Change some default settings - latch VU */
-        reg_cache[WM8741_DACLLSB_ATTENUATION] |= WM8741_UPDATELL;
-        reg_cache[WM8741_DACLMSB_ATTENUATION] |= WM8741_UPDATELM;
-        reg_cache[WM8741_DACRLSB_ATTENUATION] |= WM8741_UPDATERL;
-        reg_cache[WM8741_DACRLSB_ATTENUATION] |= WM8741_UPDATERM;
+        snd_soc_update_bits(codec, WM8741_DACLLSB_ATTENUATION,
+                            WM8741_UPDATELL, WM8741_UPDATELL);
+        snd_soc_update_bits(codec, WM8741_DACLMSB_ATTENUATION,
+                            WM8741_UPDATELM, WM8741_UPDATELM);
+        snd_soc_update_bits(codec, WM8741_DACRLSB_ATTENUATION,
+                            WM8741_UPDATERL, WM8741_UPDATERL);
+        snd_soc_update_bits(codec, WM8741_DACRLSB_ATTENUATION,
+                            WM8741_UPDATERM, WM8741_UPDATERM);
 
         snd_soc_add_controls(codec, wm8741_snd_controls,
                              ARRAY_SIZE(wm8741_snd_controls));
         wm8741_add_widgets(codec);
 
         dev_dbg(codec->dev, "Successful registration\n");
         return ret;
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_wm8741 = {
         .probe =        wm8741_probe,
         .resume =       wm8741_resume,
         .reg_cache_size = ARRAY_SIZE(wm8741_reg_defaults),
         .reg_word_size = sizeof(u16),
-        .reg_cache_default = &wm8741_reg_defaults,
+        .reg_cache_default = wm8741_reg_defaults,
 };
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static int wm8741_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct wm8741_priv *wm8741;
         int ret, i;
 
         wm8741 = kzalloc(sizeof(struct wm8741_priv), GFP_KERNEL);
@@ skipping 81 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8741_i2c_driver);
 #endif
 }
 module_exit(wm8741_exit);
 
 MODULE_DESCRIPTION("ASoC WM8741 driver");
 MODULE_AUTHOR("Ian Lartey <ian@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");