1 files changed, 18 insertions, 20 deletions

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index a537e4af6ae7..8d0347cf0e9a 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2006 Wolfson Microelectronics
  *
- * Author: Mike Arthur <linux@wolfsonmicro.com>
+ * Author: Mike Arthur <Mike.Arthur@wolfsonmicro.com>
  *
  * Based on wm8731.c by Richard Purdie
  *
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
+#include <linux/of_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -286,7 +287,6 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai,
         return 0;
 }
 
-
 static int wm8711_set_bias_level(struct snd_soc_codec *codec,
         enum snd_soc_bias_level level)
 {
@@ -299,6 +299,9 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+                        snd_soc_cache_sync(codec);
+
                 snd_soc_write(codec, WM8711_PWR, reg | 0x0040);
                 break;
         case SND_SOC_BIAS_OFF:
@@ -345,25 +348,14 @@ static int wm8711_suspend(struct snd_soc_codec *codec, pm_message_t state)
 
 static int wm8711_resume(struct snd_soc_codec *codec)
 {
-        int i;
-        u8 data[2];
-        u16 *cache = codec->reg_cache;
-
-        /* Sync reg_cache with the hardware */
-        for (i = 0; i < ARRAY_SIZE(wm8711_reg); i++) {
-                data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
-                data[1] = cache[i] & 0x00ff;
-                codec->hw_write(codec->control_data, data, 2);
-        }
         wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
         return 0;
 }
 
 static int wm8711_probe(struct snd_soc_codec *codec)
 {
         struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
-        int ret, reg;
+        int ret;
 
         ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type);
         if (ret < 0) {
@@ -380,10 +372,8 @@ static int wm8711_probe(struct snd_soc_codec *codec)
         wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Latch the update bits */
-        reg = snd_soc_read(codec, WM8711_LOUT1V);
-        snd_soc_write(codec, WM8711_LOUT1V, reg | 0x0100);
-        reg = snd_soc_read(codec, WM8711_ROUT1V);
-        snd_soc_write(codec, WM8711_ROUT1V, reg | 0x0100);
+        snd_soc_update_bits(codec, WM8711_LOUT1V, 0x0100, 0x0100);
+        snd_soc_update_bits(codec, WM8711_ROUT1V, 0x0100, 0x0100);
 
         snd_soc_add_controls(codec, wm8711_snd_controls,
                              ARRAY_SIZE(wm8711_snd_controls));
@@ -414,6 +404,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
         .num_dapm_routes = ARRAY_SIZE(wm8711_intercon),
 };
 
+static const struct of_device_id wm8711_of_match[] = {
+        { .compatible = "wlf,wm8711", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, wm8711_of_match);
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8711_spi_probe(struct spi_device *spi)
 {
@@ -443,8 +439,9 @@ static int __devexit wm8711_spi_remove(struct spi_device *spi)
 
 static struct spi_driver wm8711_spi_driver = {
         .driver = {
-                .name   = "wm8711-codec",
+                .name   = "wm8711",
                 .owner  = THIS_MODULE,
+                .of_match_table = wm8711_of_match,
         },
         .probe          = wm8711_spi_probe,
         .remove         = __devexit_p(wm8711_spi_remove),
@@ -487,8 +484,9 @@ MODULE_DEVICE_TABLE(i2c, wm8711_i2c_id);
 
 static struct i2c_driver wm8711_i2c_driver = {
         .driver = {
-                .name = "wm8711-codec",
+                .name = "wm8711",
                 .owner = THIS_MODULE,
+                .of_match_table = wm8711_of_match,
         },
         .probe =    wm8711_i2c_probe,
         .remove =   __devexit_p(wm8711_i2c_remove),