diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-23 07:28:33 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-23 07:32:20 -0400 |
commit | 78302a194c0ddf4438e50e3f9b327a6dce6bc8fc (patch) | |
tree | ac4b466f61cfc188b610fc5d8eca17a2b5994dda /include/linux/mfd | |
parent | 21f082a66177852365df0c955ecaef50fba9a691 (diff) |
mfd: Fix max77693 build failure
Without it we get:
drivers/mfd/max77693.c: In function ‘max77693_i2c_probe’:
drivers/mfd/max77693.c:157:2: error: implicit declaration of function
‘max77693_irq_init’ [-Werror=implicit-function-declaration]
drivers/mfd/max77693.c: In function ‘max77693_resume’:
drivers/mfd/max77693.c:215:2: error: implicit declaration of function
‘max77693_irq_resume’ [-Werror=implicit-function-declaration]
drivers/mfd/max77693-irq.c: In function ‘max77693_irq_lock’:
drivers/mfd/max77693-irq.c:104:2: error: ‘struct max77693_dev’ has no member
named ‘irqlock’
drivers/mfd/max77693-irq.c: In function ‘max77693_irq_sync_unlock’:
drivers/mfd/max77693-irq.c:119:11: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cache’
drivers/mfd/max77693-irq.c:119:42: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:122:13: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:125:24: error: ‘struct max77693_dev’ has no member
named ‘irqlock’
drivers/mfd/max77693-irq.c: In function ‘max77693_irq_mask’:
drivers/mfd/max77693-irq.c:141:11: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:143:11: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c: In function ‘max77693_irq_unmask’:
drivers/mfd/max77693-irq.c:153:11: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:155:11: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c: In function ‘max77693_irq_thread’:
drivers/mfd/max77693-irq.c:209:26: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:211:27: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:217:39: error: ‘struct max77693_dev’ has no member
named ‘irq_domain’
drivers/mfd/max77693-irq.c: In function ‘max77693_irq_init’:
drivers/mfd/max77693-irq.c:260:2: error: ‘struct max77693_dev’ has no member
named ‘irqlock’
drivers/mfd/max77693-irq.c:268:12: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:269:12: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cache’
drivers/mfd/max77693-irq.c:271:12: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cur’
drivers/mfd/max77693-irq.c:272:12: error: ‘struct max77693_dev’ has no member
named ‘irq_masks_cache’
drivers/mfd/max77693-irq.c:292:10: error: ‘struct max77693_dev’ has no member
named ‘irq_domain’
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/max77693-private.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index bf6077d3c43c..68263c5fa53c 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h | |||
@@ -198,8 +198,14 @@ struct max77693_dev { | |||
198 | struct regmap *regmap_muic; | 198 | struct regmap *regmap_muic; |
199 | struct regmap *regmap_haptic; | 199 | struct regmap *regmap_haptic; |
200 | 200 | ||
201 | struct irq_domain *irq_domain; | ||
202 | |||
201 | int irq; | 203 | int irq; |
204 | int irq_gpio; | ||
202 | bool wakeup; | 205 | bool wakeup; |
206 | struct mutex irqlock; | ||
207 | int irq_masks_cur[MAX77693_IRQ_GROUP_NR]; | ||
208 | int irq_masks_cache[MAX77693_IRQ_GROUP_NR]; | ||
203 | }; | 209 | }; |
204 | 210 | ||
205 | enum max77693_types { | 211 | enum max77693_types { |
@@ -214,4 +220,8 @@ extern int max77693_bulk_write(struct regmap *map, u8 reg, int count, | |||
214 | u8 *buf); | 220 | u8 *buf); |
215 | extern int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask); | 221 | extern int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask); |
216 | 222 | ||
223 | extern int max77693_irq_init(struct max77693_dev *max77686); | ||
224 | extern void max77693_irq_exit(struct max77693_dev *max77686); | ||
225 | extern int max77693_irq_resume(struct max77693_dev *max77686); | ||
226 | |||
217 | #endif /* __LINUX_MFD_MAX77693_PRIV_H */ | 227 | #endif /* __LINUX_MFD_MAX77693_PRIV_H */ |