Merge branch 'for-3.0' into for-3.1

diff --cc sound/soc/codecs/ad1836.c
Simple merge

diff --cc sound/soc/codecs/ad1836.h
index 4ed7d9dfb3469433b795fbde53b3ce7be454e684,9d6a3f8f8aafa29ada5b25408d0470efbd738186..f13402fe73334242ac80a6fb7dce62d1608b84c6
--- 1/sound/soc/codecs/ad1836.h
--- 2/sound/soc/codecs/ad1836.h
+++ b/sound/soc/codecs/ad1836.h
@@@ -25,23 -25,34 +25,25 @@@
  #define AD1836_DAC_SERFMT_PCK256       (0x4 << 5)
  #define AD1836_DAC_SERFMT_PCK128       (0x5 << 5)
  #define AD1836_DAC_WORD_LEN_MASK       0x18
+ #define AD1836_DAC_WORD_LEN_OFFSET     3
  
  #define AD1836_DAC_CTRL2               1
 -#define AD1836_DACL1_MUTE              0
 -#define AD1836_DACR1_MUTE              1
 -#define AD1836_DACL2_MUTE              2
 -#define AD1836_DACR2_MUTE              3
 -#define AD1836_DACL3_MUTE              4
 -#define AD1836_DACR3_MUTE              5
  
 -#define AD1836_DAC_L1_VOL              2
 -#define AD1836_DAC_R1_VOL              3
 -#define AD1836_DAC_L2_VOL              4
 -#define AD1836_DAC_R2_VOL              5
 -#define AD1836_DAC_L3_VOL              6
 -#define AD1836_DAC_R3_VOL              7
 +/* These macros are one-based. So AD183X_MUTE_LEFT(1) will return the mute bit
 + * for the first ADC/DAC */
 +#define AD1836_MUTE_LEFT(x) (((x) * 2) - 2)
 +#define AD1836_MUTE_RIGHT(x) (((x) * 2) - 1)
 +
 +#define AD1836_DAC_L_VOL(x) ((x) * 2)
 +#define AD1836_DAC_R_VOL(x) (1 + ((x) * 2))
  
  #define AD1836_ADC_CTRL1               12
  #define AD1836_ADC_POWERDOWN           7
  #define AD1836_ADC_HIGHPASS_FILTER     8
  
  #define AD1836_ADC_CTRL2               13
 -#define AD1836_ADCL1_MUTE             0
 -#define AD1836_ADCR1_MUTE             1
 -#define AD1836_ADCL2_MUTE             2
 -#define AD1836_ADCR2_MUTE             3
  #define AD1836_ADC_WORD_LEN_MASK       0x30
+ #define AD1836_ADC_WORD_OFFSET         5
  #define AD1836_ADC_SERFMT_MASK               (7 << 6)
  #define AD1836_ADC_SERFMT_PCK256       (0x4 << 6)
  #define AD1836_ADC_SERFMT_PCK128       (0x5 << 6)