---

yaml --- r: 308785 b: refs/heads/master c: 78302a1 h: refs/heads/master i: 308783: d8c709c v: v3
git-mirror · May 23, 2012 · c0b5dea · c0b5dea
1 parent edb11fb
commit c0b5dea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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 */