gpio: move integer GPIO support to its own file

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-pxa.c

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 42e6e64f2120364857d551df2a0de579ce7bec2d..ad3feec0075ed97c54b90f11e84234be9da945d9 100644 (file)
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -498,7 +498,7 @@ static int pxa_gpio_nums(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_OF
-static struct of_device_id pxa_gpio_dt_ids[] = {
+static const struct of_device_id pxa_gpio_dt_ids[] = {
        { .compatible = "intel,pxa25x-gpio",    .data = &pxa25x_id, },
        { .compatible = "intel,pxa26x-gpio",    .data = &pxa26x_id, },
        { .compatible = "intel,pxa27x-gpio",    .data = &pxa27x_id, },
@@ -649,6 +649,11 @@ static int pxa_gpio_probe(struct platform_device *pdev)
                                                 handle_edge_irq);
                        set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                }
+       } else {
+               if (irq0 > 0)
+                       irq_set_chained_handler(irq0, pxa_gpio_demux_handler);
+               if (irq1 > 0)
+                       irq_set_chained_handler(irq1, pxa_gpio_demux_handler);
        }
 
        irq_set_chained_handler(irq_mux, pxa_gpio_demux_handler);