Merge branch 'for-2.6.38' into for-2.6.39

diff --combined sound/soc/codecs/wm8903.h
index 9ef394a,e3ec243..db94931
--- 1/sound/soc/codecs/wm8903.h
--- 2/sound/soc/codecs/wm8903.h
+++ b/sound/soc/codecs/wm8903.h
@@@ -75,14 -75,6 +75,14 @@@ extern int wm8903_mic_detect(struct snd
  #define WM8903_ANALOGUE_SPK_OUTPUT_CONTROL_0    0x41
  #define WM8903_DC_SERVO_0                       0x43
  #define WM8903_DC_SERVO_2                       0x45
 +#define WM8903_DC_SERVO_4                     0x47
 +#define WM8903_DC_SERVO_5                     0x48
 +#define WM8903_DC_SERVO_6                     0x49
 +#define WM8903_DC_SERVO_7                     0x4A
 +#define WM8903_DC_SERVO_READBACK_1            0x51
 +#define WM8903_DC_SERVO_READBACK_2            0x52
 +#define WM8903_DC_SERVO_READBACK_3            0x53
 +#define WM8903_DC_SERVO_READBACK_4            0x54
  #define WM8903_ANALOGUE_HP_0                    0x5A
  #define WM8903_ANALOGUE_LINEOUT_0               0x5E
  #define WM8903_CHARGE_PUMP_0                    0x62
@@@ -173,7 -165,7 +173,7 @@@
  
  #define WM8903_VMID_RES_50K                          2
  #define WM8903_VMID_RES_250K                         3
- #define WM8903_VMID_RES_5K                           4
+ #define WM8903_VMID_RES_5K                           6
  
  /*
   * R8 (0x08) - Analogue DAC 0

diff --combined sound/soc/codecs/wm8994.c
index c0adbf8,ebaee5c..b23e910
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -112,7 -112,7 +112,7 @@@ struct wm8994_priv 
        unsigned int aif2clk_enable:1;
  };
  
 -static int wm8994_readable(unsigned int reg)
 +static int wm8994_readable(struct snd_soc_codec *codec, unsigned int reg)
  {
        switch (reg) {
        case WM8994_GPIO_1:
@@@ -139,7 -139,7 +139,7 @@@
        return wm8994_access_masks[reg].readable != 0;
  }
  
 -static int wm8994_volatile(unsigned int reg)
 +static int wm8994_volatile(struct snd_soc_codec *codec, unsigned int reg)
  {
        if (reg >= WM8994_CACHE_SIZE)
                return 1;
@@@ -167,7 -167,7 +167,7 @@@ static int wm8994_write(struct snd_soc_
  
        BUG_ON(reg > WM8994_MAX_REGISTER);
  
 -      if (!wm8994_volatile(reg)) {
 +      if (!wm8994_volatile(codec, reg)) {
                ret = snd_soc_cache_write(codec, reg, value);
                if (ret != 0)
                        dev_err(codec->dev, "Cache write to %x failed: %d\n",
@@@ -185,7 -185,7 +185,7 @@@ static unsigned int wm8994_read(struct 
  
        BUG_ON(reg > WM8994_MAX_REGISTER);
  
 -      if (!wm8994_volatile(reg) && wm8994_readable(reg) &&
 +      if (!wm8994_volatile(codec, reg) && wm8994_readable(codec, reg) &&
            reg < codec->driver->reg_cache_size) {
                ret = snd_soc_cache_read(codec, reg, &val);
                if (ret >= 0)
@@@ -526,7 -526,7 +526,7 @@@ static int wm8994_get_retune_mobile_enu
                                         struct snd_ctl_elem_value *ucontrol)
  {
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 -      struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata(codec);
 +      struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
        int block = wm8994_get_retune_mobile_block(kcontrol->id.name);
  
        ucontrol->value.enumerated.item[0] = wm8994->retune_mobile_cfg[block];
@@@ -3000,11 -3000,10 +3000,10 @@@ static void wm8958_default_micdet(u16 s
                report |= SND_JACK_BTN_5;
  
  done:
-       snd_soc_jack_report(wm8994->micdet[0].jack,
+       snd_soc_jack_report(wm8994->micdet[0].jack, report,
                            SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
                            SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
-                           SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT,
-                           report);
+                           SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT);
  }
  
  /**
@@@ -3109,7 -3108,7 +3108,7 @@@ static int wm8994_codec_probe(struct sn
        /* Read our current status back from the chip - we don't want to
         * reset as this may interfere with the GPIO or LDO operation. */
        for (i = 0; i < WM8994_CACHE_SIZE; i++) {
 -              if (!wm8994_readable(i) || wm8994_volatile(i))
 +              if (!wm8994_readable(codec, i) || wm8994_volatile(codec, i))
                        continue;
  
                ret = wm8994_reg_read(codec->control_data, i);