Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.11

Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 94ac944d12f0..7e7fbce7a308 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -125,8 +125,15 @@
 
 #define TWL6040_HSDACENA                (1 << 0)
 #define TWL6040_HSDACMODE               (1 << 1)
+#define TWL6040_HSDRVENA                (1 << 2)
 #define TWL6040_HSDRVMODE               (1 << 3)
 
+/* HFLCTL/R (0x14/0x16) fields */
+
+#define TWL6040_HFDACENA                (1 << 0)
+#define TWL6040_HFPGAENA                (1 << 1)
+#define TWL6040_HFDRVENA                (1 << 4)
+
 /* VIBCTLL/R (0x18/0x1A) fields */
 
 #define TWL6040_VIBENA                  (1 << 0)