Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[karo-tx-linux.git] / drivers / mfd / mc13xxx.h

diff --git a/drivers/mfd/mc13xxx.h b/drivers/mfd/mc13xxx.h
index ae7f1659f5d1efedd82bd68af21faab44b4c0fa0..33677d1dcf66857d8f104291794737c882960ff7 100644 (file)
--- a/drivers/mfd/mc13xxx.h
+++ b/drivers/mfd/mc13xxx.h
@@ -13,7 +13,9 @@
 #include <linux/regmap.h>
 #include <linux/mfd/mc13xxx.h>
 
-#define MC13XXX_NUMREGS 0x3f
+#define MC13XXX_NUMREGS                0x3f
+#define MC13XXX_IRQ_REG_CNT    2
+#define MC13XXX_IRQ_PER_REG    24
 
 struct mc13xxx;
 
@@ -33,13 +35,14 @@ struct mc13xxx {
        struct device *dev;
        const struct mc13xxx_variant *variant;
 
+       struct regmap_irq irqs[MC13XXX_IRQ_PER_REG * MC13XXX_IRQ_REG_CNT];
+       struct regmap_irq_chip irq_chip;
+       struct regmap_irq_chip_data *irq_data;
+
        struct mutex lock;
        int irq;
        int flags;
 
-       irq_handler_t irqhandler[MC13XXX_NUM_IRQ];
-       void *irqdata[MC13XXX_NUM_IRQ];
-
        int adcflags;
 };