Commit ae4f4cfd authored by Rob Herring's avatar Rob Herring Committed by Linus Walleij
Browse files

gpio: pxa: remove mach IRQ includes 



In preparation to enable ARCH_MMP on ARM64, the include of mach/irqs.h
must be eliminated. mach/irqs.h was being included for IRQ_GPIO{0,1},
but these IRQs are always passed in as resources now. We can use irq0
and irq1 and get rid of IRQ_GPIOx. Get rid of the ifdef in the process
as it is no longer needed.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 37fc8a92

drivers/gpio/gpio-pxa.c

+18 −20
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/gpio.h>

#include <linux/gpio-pxa.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/irqchip/chained_irq.h>
@@ -27,8 +28,6 @@ 
#include <linux/syscore_ops.h>

#include <linux/slab.h>



#include <mach/irqs.h>



/*

 * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with

 * one set of registers. The register offsets are organized below:
@@ -629,19 +628,18 @@ static int pxa_gpio_probe(struct platform_device *pdev) 
	}



	if (!use_of) {

#ifdef CONFIG_ARCH_PXA

		if (irq0 > 0) {

			irq = gpio_to_irq(0);

			irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,

						 handle_edge_irq);

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

		irq_set_chained_handler(IRQ_GPIO0, pxa_gpio_demux_handler);



		}

		if (irq1 > 0) {

			irq = gpio_to_irq(1);

			irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,

						 handle_edge_irq);

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

		irq_set_chained_handler(IRQ_GPIO1, pxa_gpio_demux_handler);

#endif

		}



		for (irq  = gpio_to_irq(gpio_offset);

			irq <= gpio_to_irq(pxa_last_gpio); irq++) {
@@ -649,12 +647,12 @@ 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);

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE