Merge branch 'for-2.6.34' into for-2.6.35

Conflicts due to context changes next to the backported DMA data change:
	include/sound/soc.h

1 files changed, 31 insertions, 25 deletions

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index fc3dce814924..e00201e0820e 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3015,34 +3015,39 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_OFF:
-                /* Switch over to startup biases */
-                snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                                    WM8994_BIAS_SRC | WM8994_STARTUP_BIAS_ENA |
-                                    WM8994_VMID_BUF_ENA |
-                                    WM8994_VMID_RAMP_MASK,
-                                    WM8994_BIAS_SRC | WM8994_STARTUP_BIAS_ENA |
-                                    WM8994_VMID_BUF_ENA |
-                                    (1 << WM8994_VMID_RAMP_SHIFT));
-
-                /* Disable main biases */
-                snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
-                                    WM8994_BIAS_ENA | WM8994_VMID_SEL_MASK, 0);
+                if (codec->bias_level == SND_SOC_BIAS_STANDBY) {
+                        /* Switch over to startup biases */
+                        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+                                            WM8994_BIAS_SRC |
+                                            WM8994_STARTUP_BIAS_ENA |
+                                            WM8994_VMID_BUF_ENA |
+                                            WM8994_VMID_RAMP_MASK,
+                                            WM8994_BIAS_SRC |
+                                            WM8994_STARTUP_BIAS_ENA |
+                                            WM8994_VMID_BUF_ENA |
+                                            (1 << WM8994_VMID_RAMP_SHIFT));
 
-                /* Discharge line */
-                snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
-                                    WM8994_LINEOUT1_DISCH |
-                                    WM8994_LINEOUT2_DISCH,
-                                    WM8994_LINEOUT1_DISCH |
-                                    WM8994_LINEOUT2_DISCH);
+                        /* Disable main biases */
+                        snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
+                                            WM8994_BIAS_ENA |
+                                            WM8994_VMID_SEL_MASK, 0);
 
-                msleep(5);
+                        /* Discharge line */
+                        snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
+                                            WM8994_LINEOUT1_DISCH |
+                                            WM8994_LINEOUT2_DISCH,
+                                            WM8994_LINEOUT1_DISCH |
+                                            WM8994_LINEOUT2_DISCH);
 
-                /* Switch off startup biases */
-                snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                                    WM8994_BIAS_SRC | WM8994_STARTUP_BIAS_ENA |
-                                    WM8994_VMID_BUF_ENA |
-                                    WM8994_VMID_RAMP_MASK, 0);
+                        msleep(5);
 
+                        /* Switch off startup biases */
+                        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+                                            WM8994_BIAS_SRC |
+                                            WM8994_STARTUP_BIAS_ENA |
+                                            WM8994_VMID_BUF_ENA |
+                                            WM8994_VMID_RAMP_MASK, 0);
+                }
                 break;
         }
         codec->bias_level = level;
@@ -3866,11 +3871,12 @@ static int wm8994_codec_probe(struct platform_device *pdev)
         case 3:
                 wm8994->hubs.dcs_codes = -5;
                 wm8994->hubs.hp_startup_mode = 1;
+                wm8994->hubs.dcs_readback_mode = 1;
                 break;
         default:
+                wm8994->hubs.dcs_readback_mode = 1;
                 break;
         }
-                           
 
         ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC1_DET,
                                  wm8994_mic_irq, "Mic 1 detect", wm8994);