Merge branch 'for-3.1' into for-3.2

diff --combined sound/soc/codecs/wm8994.c
index fb5c96163610f4c599c57c90320505c6aaaed88d,b393f9fac97a5e75a8bc1b44cb3c6f898482cad3..4487c5e6ad8927e3d289cc3c6ccc682e34f23f32
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -107,7 -107,6 +107,7 @@@ static int wm8994_volatile(struct snd_s
        case WM8994_LDO_2:
        case WM8958_DSP2_EXECCONTROL:
        case WM8958_MIC_DETECT_3:
 +      case WM8994_DC_SERVO_4E:
                return 1;
        default:
                return 0;
@@@ -2973,16 -2972,16 +2973,17 @@@ static int wm8994_codec_probe(struct sn
                switch (wm8994->revision) {
                case 2:
                case 3:
 -                      wm8994->hubs.dcs_codes = -5;
 +                      wm8994->hubs.dcs_codes_l = -5;
 +                      wm8994->hubs.dcs_codes_r = -5;
                        wm8994->hubs.hp_startup_mode = 1;
                        wm8994->hubs.dcs_readback_mode = 1;
                        wm8994->hubs.series_startup = 1;
                        break;
                default:
 -                      wm8994->hubs.dcs_readback_mode = 1;
 +                      wm8994->hubs.dcs_readback_mode = 2;
                        break;
                }
+               break;
  
        case WM8958:
                wm8994->hubs.dcs_readback_mode = 1;