Merge branch 'core' of git://amd64.org/linux/rric into perf/core

[karo-tx-linux.git] / include / linux / mfd / twl6040.h

diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 2f8585a4c74b9ed7f67db6e1bbf8da8ac725462a..2463c2619596fab1667b1ca1c5365c5963bf29ea 100644 (file)
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -122,6 +122,7 @@
 
 /* HSLCTL/R (0x10/0x11) fields */
 
+#define TWL6040_HSDACENA               (1 << 0)
 #define TWL6040_HSDACMODE              (1 << 1)
 #define TWL6040_HSDRVMODE              (1 << 3)
 
@@ -209,10 +210,13 @@ int twl6040_get_pll(struct twl6040 *twl6040);
 unsigned int twl6040_get_sysclk(struct twl6040 *twl6040);
 int twl6040_irq_init(struct twl6040 *twl6040);
 void twl6040_irq_exit(struct twl6040 *twl6040);
+/* Get the combined status of the vibra control register */
+int twl6040_get_vibralr_status(struct twl6040 *twl6040);
 
 static inline int twl6040_get_revid(struct twl6040 *twl6040)
 {
        return twl6040->rev;
 }
 
+
 #endif  /* End of __TWL6040_CODEC_H__ */