From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 12 Dec 2011 16:12:48 +0000 (+0800)
Subject: Merge branch 'topic/irq' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v3.3-rc1~14^2~152^2~1
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=e292b578c9bd587ad8fe230aa0500bde7be3c68a

Merge branch 'topic/irq' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into wm8994-mfd
---

e292b578c9bd587ad8fe230aa0500bde7be3c68a
diff --cc include/linux/regmap.h
index 86923a98a76,e7e8953e8c2..946868c67cd
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@@ -145,6 -143,53 +145,54 @@@ int regmap_update_bits(struct regmap *m
  int regcache_sync(struct regmap *map);
  void regcache_cache_only(struct regmap *map, bool enable);
  void regcache_cache_bypass(struct regmap *map, bool enable);
 +void regcache_mark_dirty(struct regmap *map);
  
+ /**
+  * Description of an IRQ for the generic regmap irq_chip.
+  *
+  * @reg_offset: Offset of the status/mask register within the bank
+  * @mask:       Mask used to flag/control the register.
+  */
+ struct regmap_irq {
+ 	unsigned int reg_offset;
+ 	unsigned int mask;
+ };
+ 
+ /**
+  * Description of a generic regmap irq_chip.  This is not intended to
+  * handle every possible interrupt controller, but it should handle a
+  * substantial proportion of those that are found in the wild.
+  *
+  * @name:        Descriptive name for IRQ controller.
+  *
+  * @status_base: Base status register address.
+  * @mask_base:   Base mask register address.
+  * @ack_base:    Base ack address.  If zero then the chip is clear on read.
+  *
+  * @num_regs:    Number of registers in each control bank.
+  * @irqs:        Descriptors for individual IRQs.  Interrupt numbers are
+  *               assigned based on the index in the array of the interrupt.
+  * @num_irqs:    Number of descriptors.
+  */
+ struct regmap_irq_chip {
+ 	const char *name;
+ 
+ 	unsigned int status_base;
+ 	unsigned int mask_base;
+ 	unsigned int ack_base;
+ 
+ 	int num_regs;
+ 
+ 	const struct regmap_irq *irqs;
+ 	int num_irqs;
+ };
+ 
+ struct regmap_irq_chip_data;
+ 
+ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
+ 			int irq_base, struct regmap_irq_chip *chip,
+ 			struct regmap_irq_chip_data **data);
+ void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data);
+ int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data);
+ 
  #endif