Merge commit 'v2.6.29' into x86/setup-lzma

[linux-2.6-omap-h63xx.git] / sound / soc / codecs / twl4030.h

diff --git a/sound/soc/codecs/twl4030.h b/sound/soc/codecs/twl4030.h
index 54615c76802bd633918ea01513c93a34619ca777..442e5a82861736d71ac801ffcbcc57ca7560ef15 100644 (file)
--- a/sound/soc/codecs/twl4030.h
+++ b/sound/soc/codecs/twl4030.h
@@ -147,6 +147,13 @@
 #define TWL4030_AVADC_CLK_PRIORITY     0x04
 #define TWL4030_ADCR_EN                        0x02
 
+/* TWL4030_REG_ADCMICSEL (0x08) Fields */
+
+#define TWL4030_DIGMIC1_EN             0x08
+#define TWL4030_TX2IN_SEL              0x04
+#define TWL4030_DIGMIC0_EN             0x02
+#define TWL4030_TX1IN_SEL              0x01
+
 /* AUDIO_IF (0x0E) Fields */
 
 #define TWL4030_AIF_SLAVE_EN           0x80