From c0b5dea9826805a863f31ae037f92e636dab267b Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Wed, 23 May 2012 13:28:33 +0200 Subject: [PATCH] --- yaml --- r: 308785 b: refs/heads/master c: 78302a194c0ddf4438e50e3f9b327a6dce6bc8fc h: refs/heads/master i: 308783: d8c709c30e48881652a7fed5b169358c34711fff v: v3 --- [refs] | 2 +- trunk/include/linux/mfd/max77693-private.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3d6ad0b13cdf..2d2084157852 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21f082a66177852365df0c955ecaef50fba9a691 +refs/heads/master: 78302a194c0ddf4438e50e3f9b327a6dce6bc8fc diff --git a/trunk/include/linux/mfd/max77693-private.h b/trunk/include/linux/mfd/max77693-private.h index bf6077d3c43c..68263c5fa53c 100644 --- a/trunk/include/linux/mfd/max77693-private.h +++ b/trunk/include/linux/mfd/max77693-private.h @@ -198,8 +198,14 @@ struct max77693_dev { struct regmap *regmap_muic; struct regmap *regmap_haptic; + struct irq_domain *irq_domain; + int irq; + int irq_gpio; bool wakeup; + struct mutex irqlock; + int irq_masks_cur[MAX77693_IRQ_GROUP_NR]; + int irq_masks_cache[MAX77693_IRQ_GROUP_NR]; }; enum max77693_types { @@ -214,4 +220,8 @@ extern int max77693_bulk_write(struct regmap *map, u8 reg, int count, u8 *buf); extern int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask); +extern int max77693_irq_init(struct max77693_dev *max77686); +extern void max77693_irq_exit(struct max77693_dev *max77686); +extern int max77693_irq_resume(struct max77693_dev *max77686); + #endif /* __LINUX_MFD_MAX77693_PRIV_H */