Merge tag 'asoc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.14

A few fixes, all in drivers.  Nothing stands out particularly, the
biggest set of fixes is some build coverage issues from Sachin.

1 files changed, 3 insertions, 0 deletions

diff --git a/sound/soc/codecs/tlv320aic32x4.h b/sound/soc/codecs/tlv320aic32x4.h
index 35774223fd91..995f033a855d 100644
--- a/sound/soc/codecs/tlv320aic32x4.h
+++ b/sound/soc/codecs/tlv320aic32x4.h
@@ -120,7 +120,9 @@
 #define AIC32X4_MICBIAS_2075V           0x60
 
 #define AIC32X4_LMICPGANIN_IN2R_10K     0x10
+#define AIC32X4_LMICPGANIN_CM1L_10K     0x40
 #define AIC32X4_RMICPGANIN_IN1L_10K     0x10
+#define AIC32X4_RMICPGANIN_CM1R_10K     0x40
 
 #define AIC32X4_LMICPGAVOL_NOGAIN       0x80
 #define AIC32X4_RMICPGAVOL_NOGAIN       0x80
@@ -138,6 +140,7 @@
 #define AIC32X4_LDAC2RCHN               (0x02 << 4)
 #define AIC32X4_LDAC2LCHN               (0x01 << 4)
 #define AIC32X4_RDAC2RCHN               (0x01 << 2)
+#define AIC32X4_DAC_CHAN_MASK           0x3c
 
 #define AIC32X4_SSTEP2WCLK              0x01
 #define AIC32X4_MUTEON                  0x0C