Merge branch 'gpio-irqchip-rework' of /home/linus/linux-gpio into devel

20 files changed, 27 insertions, 29 deletions

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 0944310225db..72d122748293 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -383,7 +383,7 @@ static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc,
                 /* FIXME: no clue why the code looks up the type here */
                 type = pc->irq_type[gpio];
 
-                generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irqdomain,
+                generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
                                                      gpio));
         }
 }
@@ -665,7 +665,7 @@ static void bcm2835_pctl_pin_dbg_show(struct pinctrl_dev *pctldev,
         enum bcm2835_fsel fsel = bcm2835_pinctrl_fsel_get(pc, offset);
         const char *fname = bcm2835_functions[fsel];
         int value = bcm2835_gpio_get_bit(pc, GPLEV0, offset);
-        int irq = irq_find_mapping(chip->irqdomain, offset);
+        int irq = irq_find_mapping(chip->irq.domain, offset);
 
         seq_printf(s, "function %s in %s; irq %d (%s)",
                 fname, value ? "hi" : "lo",
diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
index 5d08d989b1d0..b70058caee50 100644
--- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
@@ -172,7 +172,7 @@ static void iproc_gpio_irq_handler(struct irq_desc *desc)
 
                 for_each_set_bit(bit, &val, NGPIOS_PER_BANK) {
                         unsigned pin = NGPIOS_PER_BANK * i + bit;
-                        int child_irq = irq_find_mapping(gc->irqdomain, pin);
+                        int child_irq = irq_find_mapping(gc->irq.domain, pin);
 
                         /*
                          * Clear the interrupt before invoking the
diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index 0f3a02495aeb..9c1ca29c60b7 100644
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -1627,7 +1627,7 @@ static void byt_gpio_irq_handler(struct irq_desc *desc)
                 pending = readl(reg);
                 raw_spin_unlock(&vg->lock);
                 for_each_set_bit(pin, &pending, 32) {
-                        virq = irq_find_mapping(vg->chip.irqdomain, base + pin);
+                        virq = irq_find_mapping(vg->chip.irq.domain, base + pin);
                         generic_handle_irq(virq);
                 }
         }
@@ -1660,7 +1660,7 @@ static void byt_gpio_irq_init_hw(struct byt_gpio *vg)
 
                 value = readl(reg);
                 if (value & BYT_DIRECT_IRQ_EN) {
-                        clear_bit(i, gc->irq_valid_mask);
+                        clear_bit(i, gc->irq.valid_mask);
                         dev_dbg(dev, "excluding GPIO %d from IRQ domain\n", i);
                 } else if ((value & BYT_PIN_MUX) == byt_get_gpio_mux(vg, i)) {
                         byt_gpio_clear_triggering(vg, i);
@@ -1703,7 +1703,7 @@ static int byt_gpio_probe(struct byt_gpio *vg)
         gc->can_sleep   = false;
         gc->parent      = &vg->pdev->dev;
         gc->ngpio       = vg->soc_data->npins;
-        gc->irq_need_valid_mask = true;
+        gc->irq.need_valid_mask = true;
 
 #ifdef CONFIG_PM_SLEEP
         vg->saved_context = devm_kcalloc(&vg->pdev->dev, gc->ngpio,
diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
index 8d50eaec9577..d6bdf61eeed8 100644
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -1523,7 +1523,7 @@ static void chv_gpio_irq_handler(struct irq_desc *desc)
                 unsigned irq, offset;
 
                 offset = pctrl->intr_lines[intr_line];
-                irq = irq_find_mapping(gc->irqdomain, offset);
+                irq = irq_find_mapping(gc->irq.domain, offset);
                 generic_handle_irq(irq);
         }
 
@@ -1584,7 +1584,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
         chip->label = dev_name(pctrl->dev);
         chip->parent = pctrl->dev;
         chip->base = -1;
-        chip->irq_need_valid_mask = need_valid_mask;
+        chip->irq.need_valid_mask = need_valid_mask;
 
         ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);
         if (ret) {
@@ -1616,7 +1616,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
                 intsel >>= CHV_PADCTRL0_INTSEL_SHIFT;
 
                 if (need_valid_mask && intsel >= pctrl->community->nirqs)
-                        clear_bit(i, chip->irq_valid_mask);
+                        clear_bit(i, chip->irq.valid_mask);
         }
 
         /* Clear all interrupts */
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 3761fd29100f..12a1af45acb9 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1006,7 +1006,7 @@ static irqreturn_t intel_gpio_community_irq_handler(struct intel_pinctrl *pctrl,
                         if (padno >= community->npins)
                                 break;
 
-                        irq = irq_find_mapping(gc->irqdomain,
+                        irq = irq_find_mapping(gc->irq.domain,
                                                community->pin_base + padno);
                         generic_handle_irq(irq);
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 4e8d836a8c6f..d45af31b86b4 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -639,7 +639,7 @@ static void armada_37xx_irq_handler(struct irq_desc *desc)
         struct gpio_chip *gc = irq_desc_get_handler_data(desc);
         struct irq_chip *chip = irq_desc_get_chip(desc);
         struct armada_37xx_pinctrl *info = gpiochip_get_data(gc);
-        struct irq_domain *d = gc->irqdomain;
+        struct irq_domain *d = gc->irq.domain;
         int i;
 
         chained_irq_enter(chip, desc);
@@ -690,15 +690,13 @@ static void armada_37xx_irq_handler(struct irq_desc *desc)
 
 static unsigned int armada_37xx_irq_startup(struct irq_data *d)
 {
-        struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
-        int irq = d->hwirq - chip->irq_base;
         /*
          * The mask field is a "precomputed bitmask for accessing the
          * chip registers" which was introduced for the generic
          * irqchip framework. As we don't use this framework, we can
          * reuse this field for our own usage.
          */
-        d->mask = BIT(irq % GPIO_PER_REG);
+        d->mask = BIT(d->hwirq % GPIO_PER_REG);
 
         armada_37xx_irq_unmask(d);
 
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index a53f1a9b1ed2..f0e7a8c114b2 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -413,7 +413,7 @@ nmk_gpio_disable_lazy_irq(struct nmk_gpio_chip *nmk_chip, unsigned offset)
         u32 falling = nmk_chip->fimsc & BIT(offset);
         u32 rising = nmk_chip->rimsc & BIT(offset);
         int gpio = nmk_chip->chip.base + offset;
-        int irq = irq_find_mapping(nmk_chip->chip.irqdomain, offset);
+        int irq = irq_find_mapping(nmk_chip->chip.irq.domain, offset);
         struct irq_data *d = irq_get_irq_data(irq);
 
         if (!rising && !falling)
@@ -815,7 +815,7 @@ static void __nmk_gpio_irq_handler(struct irq_desc *desc, u32 status)
         while (status) {
                 int bit = __ffs(status);
 
-                generic_handle_irq(irq_find_mapping(chip->irqdomain, bit));
+                generic_handle_irq(irq_find_mapping(chip->irq.domain, bit));
                 status &= ~BIT(bit);
         }
 
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index d10d280ab1c9..b9c0dd75319e 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -532,7 +532,7 @@ static irqreturn_t amd_gpio_irq_handler(int irq, void *dev_id)
                         regval = readl(regs + i);
                         if (!(regval & PIN_IRQ_PENDING))
                                 continue;
-                        irq = irq_find_mapping(gc->irqdomain, irqnr + i);
+                        irq = irq_find_mapping(gc->irq.domain, irqnr + i);
                         generic_handle_irq(irq);
                         /* Clear interrupt */
                         writel(regval, regs + i);
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 569bc28cb909..03492e3c09fa 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1603,7 +1603,7 @@ static void gpio_irq_handler(struct irq_desc *desc)
 
                 for_each_set_bit(n, &isr, BITS_PER_LONG) {
                         generic_handle_irq(irq_find_mapping(
-                                           gpio_chip->irqdomain, n));
+                                           gpio_chip->irq.domain, n));
                 }
         }
         chained_irq_exit(chip, desc);
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index ac155e7d3412..7939b178c6ae 100644
--- a/drivers/pinctrl/pinctrl-coh901.c
+++ b/drivers/pinctrl/pinctrl-coh901.c
@@ -517,7 +517,7 @@ static void u300_gpio_irq_handler(struct irq_desc *desc)
 
                 for_each_set_bit(irqoffset, &val, U300_GPIO_PINS_PER_PORT) {
                         int offset = pinoffset + irqoffset;
-                        int pin_irq = irq_find_mapping(chip->irqdomain, offset);
+                        int pin_irq = irq_find_mapping(chip->irq.domain, offset);
 
                         dev_dbg(gpio->dev, "GPIO IRQ %d on pin %d\n",
                                 pin_irq, offset);
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index a7602be296a2..0aef30ead5dc 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -535,7 +535,7 @@ static irqreturn_t mcp23s08_irq(int irq, void *data)
                     ((gpio_bit_changed || intcap_changed) &&
                         (BIT(i) & mcp->irq_fall) && !gpio_set) ||
                     defval_changed) {
-                        child_irq = irq_find_mapping(mcp->chip.irqdomain, i);
+                        child_irq = irq_find_mapping(mcp->chip.irq.domain, i);
                         handle_nested_irq(child_irq);
                 }
         }
diff --git a/drivers/pinctrl/pinctrl-oxnas.c b/drivers/pinctrl/pinctrl-oxnas.c
index 494ec9a7573a..53ec22a51f5c 100644
--- a/drivers/pinctrl/pinctrl-oxnas.c
+++ b/drivers/pinctrl/pinctrl-oxnas.c
@@ -1064,7 +1064,7 @@ static void oxnas_gpio_irq_handler(struct irq_desc *desc)
         stat = readl(bank->reg_base + IRQ_PENDING);
 
         for_each_set_bit(pin, &stat, BITS_PER_LONG)
-                generic_handle_irq(irq_linear_revmap(gc->irqdomain, pin));
+                generic_handle_irq(irq_linear_revmap(gc->irq.domain, pin));
 
         chained_irq_exit(chip, desc);
 }
diff --git a/drivers/pinctrl/pinctrl-pic32.c b/drivers/pinctrl/pinctrl-pic32.c
index 31ceb958b3fe..96390228d388 100644
--- a/drivers/pinctrl/pinctrl-pic32.c
+++ b/drivers/pinctrl/pinctrl-pic32.c
@@ -2106,7 +2106,7 @@ static void pic32_gpio_irq_handler(struct irq_desc *desc)
         pending = pic32_gpio_get_pending(gc, stat);
 
         for_each_set_bit(pin, &pending, BITS_PER_LONG)
-                generic_handle_irq(irq_linear_revmap(gc->irqdomain, pin));
+                generic_handle_irq(irq_linear_revmap(gc->irq.domain, pin));
 
         chained_irq_exit(chip, desc);
 }
diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c
index 55375b1b3cc8..302190d1558d 100644
--- a/drivers/pinctrl/pinctrl-pistachio.c
+++ b/drivers/pinctrl/pinctrl-pistachio.c
@@ -1307,7 +1307,7 @@ static void pistachio_gpio_irq_handler(struct irq_desc *desc)
         pending = gpio_readl(bank, GPIO_INTERRUPT_STATUS) &
                 gpio_readl(bank, GPIO_INTERRUPT_EN);
         for_each_set_bit(pin, &pending, 16)
-                generic_handle_irq(irq_linear_revmap(gc->irqdomain, pin));
+                generic_handle_irq(irq_linear_revmap(gc->irq.domain, pin));
         chained_irq_exit(chip, desc);
 }
 
diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
index a5205b94b2e6..2081c67667a8 100644
--- a/drivers/pinctrl/pinctrl-st.c
+++ b/drivers/pinctrl/pinctrl-st.c
@@ -1408,7 +1408,7 @@ static void __gpio_irq_handler(struct st_gpio_bank *bank)
                                         continue;
                         }
 
-                        generic_handle_irq(irq_find_mapping(bank->gpio_chip.irqdomain, n));
+                        generic_handle_irq(irq_find_mapping(bank->gpio_chip.irq.domain, n));
                 }
         }
 }
diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
index c5ab8cef942d..fb242c542dc9 100644
--- a/drivers/pinctrl/pinctrl-sx150x.c
+++ b/drivers/pinctrl/pinctrl-sx150x.c
@@ -561,7 +561,7 @@ static irqreturn_t sx150x_irq_thread_fn(int irq, void *dev_id)
 
         status = val;
         for_each_set_bit(n, &status, pctl->data->ngpios)
-                handle_nested_irq(irq_find_mapping(pctl->gpio.irqdomain, n));
+                handle_nested_irq(irq_find_mapping(pctl->gpio.irq.domain, n));
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index ff491da64dab..7a960590ecaa 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -795,7 +795,7 @@ static void msm_gpio_irq_handler(struct irq_desc *desc)
                 g = &pctrl->soc->groups[i];
                 val = readl(pctrl->regs + g->intr_status_reg);
                 if (val & BIT(g->intr_status_bit)) {
-                        irq_pin = irq_find_mapping(gc->irqdomain, i);
+                        irq_pin = irq_find_mapping(gc->irq.domain, i);
                         generic_handle_irq(irq_pin);
                         handled++;
                 }
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas7.c b/drivers/pinctrl/sirf/pinctrl-atlas7.c
index f4b192b493a0..3abb028f6158 100644
--- a/drivers/pinctrl/sirf/pinctrl-atlas7.c
+++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c
@@ -5820,7 +5820,7 @@ static void atlas7_gpio_handle_irq(struct irq_desc *desc)
                                 __func__, gc->label,
                                 bank->gpio_offset + pin_in_bank);
                         generic_handle_irq(
-                                irq_find_mapping(gc->irqdomain,
+                                irq_find_mapping(gc->irq.domain,
                                         bank->gpio_offset + pin_in_bank));
                 }
 
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index d64add0b84cc..ca2347d0d579 100644
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -587,7 +587,7 @@ static void sirfsoc_gpio_handle_irq(struct irq_desc *desc)
                 if ((status & 0x1) && (ctrl & SIRFSOC_GPIO_CTL_INTR_EN_MASK)) {
                         pr_debug("%s: gpio id %d idx %d happens\n",
                                 __func__, bank->id, idx);
-                        generic_handle_irq(irq_find_mapping(gc->irqdomain, idx +
+                        generic_handle_irq(irq_find_mapping(gc->irq.domain, idx +
                                         bank->id * SIRFSOC_GPIO_BANK_SIZE));
                 }
 
diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c
index 7a33e2e1e3e7..6a0ed8ab33b9 100644
--- a/drivers/pinctrl/spear/pinctrl-plgpio.c
+++ b/drivers/pinctrl/spear/pinctrl-plgpio.c
@@ -401,7 +401,7 @@ static void plgpio_irq_handler(struct irq_desc *desc)
                         /* get correct irq line number */
                         pin = i * MAX_GPIO_PER_REG + pin;
                         generic_handle_irq(
-                                irq_find_mapping(gc->irqdomain, pin));
+                                irq_find_mapping(gc->irq.domain, pin));
                 }
         }
         chained_irq_exit(irqchip, desc);