Merge branch 'gpio-irq-validmask' of /home/linus/linux-pinctrl into devel

1 files changed, 6 insertions, 0 deletions

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 216e6f275aa8..1f0be7213e6d 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -112,6 +112,10 @@ enum single_ended_mode {
  *      initialization, provided by GPIO driver
  * @irq_parent: GPIO IRQ chip parent/bank linux irq number,
  *      provided by GPIO driver
+ * @irq_need_valid_mask: If set core allocates @irq_valid_mask with all
+ *      bits set to one
+ * @irq_valid_mask: If not %NULL holds bitmask of GPIOs which are valid to
+ *      be included in IRQ domain of the chip
  * @lock_key: per GPIO IRQ chip lockdep class
  *
  * A gpio_chip can help platforms abstract various sources of GPIOs so
@@ -190,6 +194,8 @@ struct gpio_chip {
         irq_flow_handler_t      irq_handler;
         unsigned int            irq_default_type;
         int                     irq_parent;
+        bool                    irq_need_valid_mask;
+        unsigned long           *irq_valid_mask;
         struct lock_class_key   *lock_key;
 #endif