diff options
Diffstat (limited to 'include/linux/mfd/twl6040.h')
-rw-r--r-- | include/linux/mfd/twl6040.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index a8eff4ad9be5..94ac944d12f0 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h | |||
@@ -207,10 +207,12 @@ struct twl6040_platform_data { | |||
207 | }; | 207 | }; |
208 | 208 | ||
209 | struct regmap; | 209 | struct regmap; |
210 | struct regmap_irq_chips_data; | ||
210 | 211 | ||
211 | struct twl6040 { | 212 | struct twl6040 { |
212 | struct device *dev; | 213 | struct device *dev; |
213 | struct regmap *regmap; | 214 | struct regmap *regmap; |
215 | struct regmap_irq_chip_data *irq_data; | ||
214 | struct regulator_bulk_data supplies[2]; /* supplies for vio, v2v1 */ | 216 | struct regulator_bulk_data supplies[2]; /* supplies for vio, v2v1 */ |
215 | struct mutex mutex; | 217 | struct mutex mutex; |
216 | struct mutex irq_mutex; | 218 | struct mutex irq_mutex; |
@@ -228,9 +230,8 @@ struct twl6040 { | |||
228 | unsigned int mclk; | 230 | unsigned int mclk; |
229 | 231 | ||
230 | unsigned int irq; | 232 | unsigned int irq; |
231 | unsigned int irq_base; | 233 | unsigned int irq_ready; |
232 | u8 irq_masks_cur; | 234 | unsigned int irq_th; |
233 | u8 irq_masks_cache; | ||
234 | }; | 235 | }; |
235 | 236 | ||
236 | int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg); | 237 | int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg); |
@@ -245,8 +246,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id, | |||
245 | unsigned int freq_in, unsigned int freq_out); | 246 | unsigned int freq_in, unsigned int freq_out); |
246 | int twl6040_get_pll(struct twl6040 *twl6040); | 247 | int twl6040_get_pll(struct twl6040 *twl6040); |
247 | unsigned int twl6040_get_sysclk(struct twl6040 *twl6040); | 248 | unsigned int twl6040_get_sysclk(struct twl6040 *twl6040); |
248 | int twl6040_irq_init(struct twl6040 *twl6040); | 249 | |
249 | void twl6040_irq_exit(struct twl6040 *twl6040); | ||
250 | /* Get the combined status of the vibra control register */ | 250 | /* Get the combined status of the vibra control register */ |
251 | int twl6040_get_vibralr_status(struct twl6040 *twl6040); | 251 | int twl6040_get_vibralr_status(struct twl6040 *twl6040); |
252 | 252 | ||