ARM: at91/gpio: add .to_irq gpio_chip handler (b134ce85) · Commits · 戴 / test

arch/arm/mach-at91/gpio.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@

		#include <linux/clk.h>
		#include <linux/errno.h>
		#include <linux/device.h>
		#include <linux/gpio.h>
		#include <linux/interrupt.h>
		#include <linux/irq.h>
		@@ -48,6 +49,7 @@ static int at91_gpiolib_direction_output(struct gpio_chip *chip,
		unsigned offset, int val);
		static int at91_gpiolib_direction_input(struct gpio_chip *chip,
		unsigned offset);
		static int at91_gpiolib_to_irq(struct gpio_chip *chip, unsigned offset);

		#define AT91_GPIO_CHIP(name, base_gpio, nr_gpio) \
		{ \
		@@ -59,6 +61,7 @@ static int at91_gpiolib_direction_input(struct gpio_chip *chip,
		.set = at91_gpiolib_set, \
		.dbg_show = at91_gpiolib_dbg_show, \
		.base = base_gpio, \
		.to_irq = at91_gpiolib_to_irq, \
		.ngpio = nr_gpio, \
		}, \
		}
		@@ -640,6 +643,16 @@ static void at91_gpiolib_dbg_show(struct seq_file s, struct gpio_chip chip)
		}
		}

		static int at91_gpiolib_to_irq(struct gpio_chip *chip, unsigned offset)
		{
		struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip);
		int virq = irq_find_mapping(at91_gpio->domain, offset);

		dev_dbg(chip->dev, "%s: request IRQ for GPIO %d, return %d\n",
		chip->label, offset + chip->base, virq);
		return virq;
		}

		static int __init at91_gpio_setup_clk(int idx)
		{
		struct at91_gpio_chip *at91_gpio = &gpio_chip[idx];

+0 −12

Original line number	Diff line number	Diff line
		@@ -204,18 +204,6 @@ extern int at91_get_gpio_value(unsigned pin);
		extern void at91_gpio_suspend(void);
		extern void at91_gpio_resume(void);

		/-------------------------------------------------------------------------/

		/* wrappers for "new style" GPIO calls. the old AT91-specific ones should
		* eventually be removed (along with this errno.h inclusion), and the
		* gpio request/free calls should probably be implemented.
		*/

		#include <asm/errno.h>

		#define gpio_to_irq(gpio) (gpio + NR_AIC_IRQS)
		#define irq_to_gpio(irq) (irq - NR_AIC_IRQS)

		#endif /* __ASSEMBLY__ */

		#endif