pinctrl: baytrail: Convert to use gpiolib irqchip

Instead of open-coding irqchip handling in the driver we can take advantage
of the new irqchip helpers provided by the gpiolib core.

While doing this we also make sure that we call gpiochip_irqchip_add()
after the gpiochip itself is registered as required.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

2 files changed, 20 insertions, 69 deletions

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 3d94e47546ec..4e3231ad03cd 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -70,7 +70,7 @@ config PINCTRL_AT91
 config PINCTRL_BAYTRAIL
         bool "Intel Baytrail GPIO pin control"
         depends on GPIOLIB && ACPI && X86
-        select IRQ_DOMAIN
+        select GPIOLIB_IRQCHIP
         help
           driver for memory mapped GPIO functionality on Intel Baytrail
           platforms. Supports 3 banks with 102, 28 and 44 gpios.
diff --git a/drivers/pinctrl/pinctrl-baytrail.c b/drivers/pinctrl/pinctrl-baytrail.c
index d8e946992323..9ca59a018743 100644
--- a/drivers/pinctrl/pinctrl-baytrail.c
+++ b/drivers/pinctrl/pinctrl-baytrail.c
@@ -25,9 +25,7 @@
 #include <linux/types.h>
 #include <linux/bitops.h>
 #include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/gpio.h>
-#include <linux/irqdomain.h>
 #include <linux/acpi.h>
 #include <linux/platform_device.h>
 #include <linux/seq_file.h>
@@ -138,7 +136,6 @@ static struct pinctrl_gpio_range byt_ranges[] = {
 
 struct byt_gpio {
         struct gpio_chip                chip;
-        struct irq_domain               *domain;
         struct platform_device          *pdev;
         spinlock_t                      lock;
         void __iomem                    *reg_base;
@@ -218,7 +215,7 @@ static void byt_gpio_free(struct gpio_chip *chip, unsigned offset)
 
 static int byt_irq_type(struct irq_data *d, unsigned type)
 {
-        struct byt_gpio *vg = irq_data_get_irq_chip_data(d);
+        struct byt_gpio *vg = to_byt_gpio(irq_data_get_irq_chip_data(d));
         u32 offset = irqd_to_hwirq(d);
         u32 value;
         unsigned long flags;
@@ -404,16 +401,10 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
         spin_unlock_irqrestore(&vg->lock, flags);
 }
 
-static int byt_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
-{
-        struct byt_gpio *vg = to_byt_gpio(chip);
-        return irq_create_mapping(vg->domain, offset);
-}
-
 static void byt_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
 {
         struct irq_data *data = irq_desc_get_irq_data(desc);
-        struct byt_gpio *vg = irq_data_get_irq_handler_data(data);
+        struct byt_gpio *vg = to_byt_gpio(irq_desc_get_handler_data(desc));
         struct irq_chip *chip = irq_data_get_irq_chip(data);
         u32 base, pin, mask;
         void __iomem *reg;
@@ -432,7 +423,7 @@ static void byt_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
                         /* Clear before handling so we can't lose an edge */
                         writel(mask, reg);
 
-                        virq = irq_find_mapping(vg->domain, base + pin);
+                        virq = irq_find_mapping(vg->chip.irqdomain, base + pin);
                         generic_handle_irq(virq);
 
                         /* In case bios or user sets triggering incorretly a pin
@@ -465,33 +456,11 @@ static void byt_irq_mask(struct irq_data *d)
 {
 }
 
-static int byt_irq_reqres(struct irq_data *d)
-{
-        struct byt_gpio *vg = irq_data_get_irq_chip_data(d);
-
-        if (gpio_lock_as_irq(&vg->chip, irqd_to_hwirq(d))) {
-                dev_err(vg->chip.dev,
-                        "unable to lock HW IRQ %lu for IRQ\n",
-                        irqd_to_hwirq(d));
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static void byt_irq_relres(struct irq_data *d)
-{
-        struct byt_gpio *vg = irq_data_get_irq_chip_data(d);
-
-        gpio_unlock_as_irq(&vg->chip, irqd_to_hwirq(d));
-}
-
 static struct irq_chip byt_irqchip = {
         .name = "BYT-GPIO",
         .irq_mask = byt_irq_mask,
         .irq_unmask = byt_irq_unmask,
         .irq_set_type = byt_irq_type,
-        .irq_request_resources = byt_irq_reqres,
-        .irq_release_resources = byt_irq_relres,
 };
 
 static void byt_gpio_irq_init_hw(struct byt_gpio *vg)
@@ -512,23 +481,6 @@ static void byt_gpio_irq_init_hw(struct byt_gpio *vg)
         }
 }
 
-static int byt_gpio_irq_map(struct irq_domain *d, unsigned int virq,
-                            irq_hw_number_t hw)
-{
-        struct byt_gpio *vg = d->host_data;
-
-        irq_set_chip_and_handler_name(virq, &byt_irqchip, handle_simple_irq,
-                                      "demux");
-        irq_set_chip_data(virq, vg);
-        irq_set_irq_type(virq, IRQ_TYPE_NONE);
-
-        return 0;
-}
-
-static const struct irq_domain_ops byt_gpio_irq_ops = {
-        .map = byt_gpio_irq_map,
-};
-
 static int byt_gpio_probe(struct platform_device *pdev)
 {
         struct byt_gpio *vg;
@@ -538,7 +490,6 @@ static int byt_gpio_probe(struct platform_device *pdev)
         struct acpi_device *acpi_dev;
         struct pinctrl_gpio_range *range;
         acpi_handle handle = ACPI_HANDLE(dev);
-        unsigned hwirq;
         int ret;
 
         if (acpi_bus_get_device(handle, &acpi_dev))
@@ -585,27 +536,27 @@ static int byt_gpio_probe(struct platform_device *pdev)
         gc->can_sleep = false;
         gc->dev = dev;
 
+        ret = gpiochip_add(gc);
+        if (ret) {
+                dev_err(&pdev->dev, "failed adding byt-gpio chip\n");
+                return ret;
+        }
+
         /* set up interrupts  */
         irq_rc = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (irq_rc && irq_rc->start) {
-                hwirq = irq_rc->start;
-                gc->to_irq = byt_gpio_to_irq;
-
-                vg->domain = irq_domain_add_linear(NULL, gc->ngpio,
-                                                   &byt_gpio_irq_ops, vg);
-                if (!vg->domain)
-                        return -ENXIO;
-
                 byt_gpio_irq_init_hw(vg);
+                ret = gpiochip_irqchip_add(gc, &byt_irqchip, 0,
+                                           handle_simple_irq, IRQ_TYPE_NONE);
+                if (ret) {
+                        dev_err(dev, "failed to add irqchip\n");
+                        gpiochip_remove(gc);
+                        return ret;
+                }
 
-                irq_set_handler_data(hwirq, vg);
-                irq_set_chained_handler(hwirq, byt_gpio_irq_handler);
-        }
-
-        ret = gpiochip_add(gc);
-        if (ret) {
-                dev_err(&pdev->dev, "failed adding byt-gpio chip\n");
-                return ret;
+                gpiochip_set_chained_irqchip(gc, &byt_irqchip,
+                                             (unsigned)irq_rc->start,
+                                             byt_gpio_irq_handler);
         }
 
         pm_runtime_enable(dev);