2 files changed, 53 insertions, 1 deletions

diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h
index b06ff2846748..de79baee4925 100644
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@ -15,14 +15,38 @@
 #ifndef __MFD_WM8994_CORE_H__
 #define __MFD_WM8994_CORE_H__
 
+#include <linux/interrupt.h>
+
 struct regulator_dev;
 struct regulator_bulk_data;
 
 #define WM8994_NUM_GPIO_REGS 11
-#define WM8994_NUM_LDO_REGS 2
+#define WM8994_NUM_LDO_REGS   2
+#define WM8994_NUM_IRQ_REGS   2
+
+#define WM8994_IRQ_TEMP_SHUT            0
+#define WM8994_IRQ_MIC1_DET             1
+#define WM8994_IRQ_MIC1_SHRT            2
+#define WM8994_IRQ_MIC2_DET             3
+#define WM8994_IRQ_MIC2_SHRT            4
+#define WM8994_IRQ_FLL1_LOCK            5
+#define WM8994_IRQ_FLL2_LOCK            6
+#define WM8994_IRQ_SRC1_LOCK            7
+#define WM8994_IRQ_SRC2_LOCK            8
+#define WM8994_IRQ_AIF1DRC1_SIG_DET     9
+#define WM8994_IRQ_AIF1DRC2_SIG_DET     10
+#define WM8994_IRQ_AIF2DRC_SIG_DET      11
+#define WM8994_IRQ_FIFOS_ERR            12
+#define WM8994_IRQ_WSEQ_DONE            13
+#define WM8994_IRQ_DCS_DONE             14
+#define WM8994_IRQ_TEMP_WARN            15
+
+/* GPIOs in the chip are numbered from 1-11 */
+#define WM8994_IRQ_GPIO(x) (x + WM8994_IRQ_TEMP_WARN)
 
 struct wm8994 {
         struct mutex io_lock;
+        struct mutex irq_lock;
 
         struct device *dev;
         int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
@@ -33,6 +57,11 @@ struct wm8994 {
         void *control_data;
 
         int gpio_base;
+        int irq_base;
+
+        int irq;
+        u16 irq_masks_cur[WM8994_NUM_IRQ_REGS];
+        u16 irq_masks_cache[WM8994_NUM_IRQ_REGS];
 
         /* Used over suspend/resume */
         u16 ldo_regs[WM8994_NUM_LDO_REGS];
@@ -51,4 +80,26 @@ int wm8994_set_bits(struct wm8994 *wm8994, unsigned short reg,
 int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg,
                      int count, u16 *buf);
 
+
+/* Helper to save on boilerplate */
+static inline int wm8994_request_irq(struct wm8994 *wm8994, int irq,
+                                     irq_handler_t handler, const char *name,
+                                     void *data)
+{
+        if (!wm8994->irq_base)
+                return -EINVAL;
+        return request_threaded_irq(wm8994->irq_base + irq, NULL, handler,
+                                    IRQF_TRIGGER_RISING, name,
+                                    data);
+}
+static inline void wm8994_free_irq(struct wm8994 *wm8994, int irq, void *data)
+{
+        if (!wm8994->irq_base)
+                return;
+        free_irq(wm8994->irq_base + irq, data);
+}
+
+int wm8994_irq_init(struct wm8994 *wm8994);
+void wm8994_irq_exit(struct wm8994 *wm8994);
+
 #endif
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 70d6a8687dc5..5c51f367c061 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -70,6 +70,7 @@ struct wm8994_pdata {
 
         struct wm8994_ldo_pdata ldo[WM8994_NUM_LDO];
 
+        int irq_base;  /** Base IRQ number for WM8994, required for IRQs */
 
         int num_drc_cfgs;
         struct wm8994_drc_cfg *drc_cfgs;