summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-30 12:42:25 +0100
committerMark Brown <broonie@linaro.org>2013-06-30 12:42:25 +0100
commite78e4c49e72db2e040fe986295acbb76811c625b (patch)
tree1c6100d7d61aec6f2e40810bd3a1b87c2495b045 /include/linux
parent233d6a903e5efd1eb4d4ee245ab79c12d2f8df73 (diff)
parent98c5fb1f875732e49ce223ba920204ec57f51511 (diff)
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/twl6040.h7
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)