Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next

[~andy/linux] / sound / soc / codecs / wm8750.c

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index d0003cc3bcd66cf16336bec69cc0f75b4de97a56..ca75a818070804610d0b7c0d10554e48cbf2f1bd 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -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>
@@ -615,6 +616,8 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec,
                break;
        case SND_SOC_BIAS_STANDBY:
                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+                       snd_soc_cache_sync(codec);
+
                        /* Set VMID to 5k */
                        snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x01c1);
 
@@ -672,28 +675,14 @@ static int wm8750_suspend(struct snd_soc_codec *codec, pm_message_t state)
 
 static int wm8750_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(wm8750_reg); i++) {
-               if (i == WM8750_RESET)
-                       continue;
-               data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
-               data[1] = cache[i] & 0x00ff;
-               codec->hw_write(codec->control_data, data, 2);
-       }
-
        wm8750_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
        return 0;
 }
 
 static int wm8750_probe(struct snd_soc_codec *codec)
 {
        struct wm8750_priv *wm8750 = snd_soc_codec_get_drvdata(codec);
-       int reg, ret;
+       int ret;
 
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8750->control_type);
        if (ret < 0) {
@@ -711,22 +700,14 @@ static int wm8750_probe(struct snd_soc_codec *codec)
        wm8750_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
        /* set the update bits */
-       reg = snd_soc_read(codec, WM8750_LDAC);
-       snd_soc_write(codec, WM8750_LDAC, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8750_RDAC);
-       snd_soc_write(codec, WM8750_RDAC, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8750_LOUT1V);
-       snd_soc_write(codec, WM8750_LOUT1V, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8750_ROUT1V);
-       snd_soc_write(codec, WM8750_ROUT1V, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8750_LOUT2V);
-       snd_soc_write(codec, WM8750_LOUT2V, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8750_ROUT2V);
-       snd_soc_write(codec, WM8750_ROUT2V, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8750_LINVOL);
-       snd_soc_write(codec, WM8750_LINVOL, reg | 0x0100);
-       reg = snd_soc_read(codec, WM8750_RINVOL);
-       snd_soc_write(codec, WM8750_RINVOL, reg | 0x0100);
+       snd_soc_update_bits(codec, WM8750_LDAC, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8750_RDAC, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8750_LOUT1V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8750_ROUT1V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8750_LOUT2V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8750_ROUT2V, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8750_LINVOL, 0x0100, 0x0100);
+       snd_soc_update_bits(codec, WM8750_RINVOL, 0x0100, 0x0100);
 
        snd_soc_add_controls(codec, wm8750_snd_controls,
                                ARRAY_SIZE(wm8750_snd_controls));
@@ -751,6 +732,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8750 = {
        .reg_cache_default = wm8750_reg,
 };
 
+static const struct of_device_id wm8750_of_match[] = {
+       { .compatible = "wlf,wm8750", },
+       { .compatible = "wlf,wm8987", },
+       { }
+};
+MODULE_DEVICE_TABLE(of, wm8750_of_match);
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8750_spi_probe(struct spi_device *spi)
 {
@@ -787,8 +775,9 @@ MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);
 
 static struct spi_driver wm8750_spi_driver = {
        .driver = {
-               .name   = "wm8750-codec",
+               .name   = "wm8750",
                .owner  = THIS_MODULE,
+               .of_match_table = wm8750_of_match,
        },
        .id_table       = wm8750_spi_ids,
        .probe          = wm8750_spi_probe,
@@ -833,8 +822,9 @@ MODULE_DEVICE_TABLE(i2c, wm8750_i2c_id);
 
 static struct i2c_driver wm8750_i2c_driver = {
        .driver = {
-               .name = "wm8750-codec",
+               .name = "wm8750",
                .owner = THIS_MODULE,
+               .of_match_table = wm8750_of_match,
        },
        .probe =    wm8750_i2c_probe,
        .remove =   __devexit_p(wm8750_i2c_remove),