Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

diff --combined sound/soc/codecs/tlv320dac33.c
index 00b6d87e7bdb9d6e9eb2fe6a0a9299e3c6d6999d,6c3735dcb05324afa62fb20986387d0289a131ff..eb1a0b4e09b6a49f09fb0f6116cee1ebc41dab6b
--- 1/sound/soc/codecs/tlv320dac33.c
--- 2/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@@ -324,6 -324,10 +324,10 @@@ static void dac33_init_chip(struct snd_
        dac33_write(codec, DAC33_OUT_AMP_CTRL,
                    dac33_read_reg_cache(codec, DAC33_OUT_AMP_CTRL));
  
+       dac33_write(codec, DAC33_LDAC_PWR_CTRL,
+                   dac33_read_reg_cache(codec, DAC33_LDAC_PWR_CTRL));
+       dac33_write(codec, DAC33_RDAC_PWR_CTRL,
+                   dac33_read_reg_cache(codec, DAC33_RDAC_PWR_CTRL));
  }
  
  static inline int dac33_read_id(struct snd_soc_codec *codec)
@@@ -670,6 -674,7 +674,7 @@@ static inline void dac33_prefill_handle
  {
        struct snd_soc_codec *codec = dac33->codec;
        unsigned int delay;
+       unsigned long flags;
  
        switch (dac33->fifo_mode) {
        case DAC33_FIFO_MODE1:
@@@ -677,10 -682,10 +682,10 @@@
                        DAC33_THRREG(dac33->nsample));
  
                /* Take the timestamps */
-               spin_lock_irq(&dac33->lock);
+               spin_lock_irqsave(&dac33->lock, flags);
                dac33->t_stamp2 = ktime_to_us(ktime_get());
                dac33->t_stamp1 = dac33->t_stamp2;
-               spin_unlock_irq(&dac33->lock);
+               spin_unlock_irqrestore(&dac33->lock, flags);
  
                dac33_write16(codec, DAC33_PREFILL_MSB,
                                DAC33_THRREG(dac33->alarm_threshold));
@@@ -692,11 -697,11 +697,11 @@@
                break;
        case DAC33_FIFO_MODE7:
                /* Take the timestamp */
-               spin_lock_irq(&dac33->lock);
+               spin_lock_irqsave(&dac33->lock, flags);
                dac33->t_stamp1 = ktime_to_us(ktime_get());
                /* Move back the timestamp with drain time */
                dac33->t_stamp1 -= dac33->mode7_us_to_lthr;
-               spin_unlock_irq(&dac33->lock);
+               spin_unlock_irqrestore(&dac33->lock, flags);
  
                dac33_write16(codec, DAC33_PREFILL_MSB,
                                DAC33_THRREG(DAC33_MODE7_MARGIN));
@@@ -714,13 -719,14 +719,14 @@@
  static inline void dac33_playback_handler(struct tlv320dac33_priv *dac33)
  {
        struct snd_soc_codec *codec = dac33->codec;
+       unsigned long flags;
  
        switch (dac33->fifo_mode) {
        case DAC33_FIFO_MODE1:
                /* Take the timestamp */
-               spin_lock_irq(&dac33->lock);
+               spin_lock_irqsave(&dac33->lock, flags);
                dac33->t_stamp2 = ktime_to_us(ktime_get());
-               spin_unlock_irq(&dac33->lock);
+               spin_unlock_irqrestore(&dac33->lock, flags);
  
                dac33_write16(codec, DAC33_NSAMPLE_MSB,
                                DAC33_THRREG(dac33->nsample));
@@@ -773,10 -779,11 +779,11 @@@ static irqreturn_t dac33_interrupt_hand
  {
        struct snd_soc_codec *codec = dev;
        struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
+       unsigned long flags;
  
-       spin_lock(&dac33->lock);
+       spin_lock_irqsave(&dac33->lock, flags);
        dac33->t_stamp1 = ktime_to_us(ktime_get());
-       spin_unlock(&dac33->lock);
+       spin_unlock_irqrestore(&dac33->lock, flags);
  
        /* Do not schedule the workqueue in Mode7 */
        if (dac33->fifo_mode != DAC33_FIFO_MODE7)
@@@ -1173,15 -1180,16 +1180,16 @@@ static snd_pcm_sframes_t dac33_dai_dela
        unsigned int time_delta, uthr;
        int samples_out, samples_in, samples;
        snd_pcm_sframes_t delay = 0;
+       unsigned long flags;
  
        switch (dac33->fifo_mode) {
        case DAC33_FIFO_BYPASS:
                break;
        case DAC33_FIFO_MODE1:
-               spin_lock(&dac33->lock);
+               spin_lock_irqsave(&dac33->lock, flags);
                t0 = dac33->t_stamp1;
                t1 = dac33->t_stamp2;
-               spin_unlock(&dac33->lock);
+               spin_unlock_irqrestore(&dac33->lock, flags);
                t_now = ktime_to_us(ktime_get());
  
                /* We have not started to fill the FIFO yet, delay is 0 */
@@@ -1246,10 -1254,10 +1254,10 @@@
                }
                break;
        case DAC33_FIFO_MODE7:
-               spin_lock(&dac33->lock);
+               spin_lock_irqsave(&dac33->lock, flags);
                t0 = dac33->t_stamp1;
                uthr = dac33->uthr;
-               spin_unlock(&dac33->lock);
+               spin_unlock_irqrestore(&dac33->lock, flags);
                t_now = ktime_to_us(ktime_get());
  
                /* We have not started to fill the FIFO yet, delay is 0 */
@@@ -1615,7 -1623,6 +1623,7 @@@ static const struct i2c_device_id tlv32
        },
        { },
  };
 +MODULE_DEVICE_TABLE(i2c, tlv320dac33_i2c_id);
  
  static struct i2c_driver tlv320dac33_i2c_driver = {
        .driver = {