From 147a7e6618ba1a6848918a543c0e3eba4d714be8 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 19 Oct 2015 10:09:30 +0000 Subject: [PATCH] oxnas: prepare pinctrl for kernel >=4.2 Signed-off-by: Daniel Golle git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47217 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c b/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c index fa5f3a9431..aa76f40e40 100644 --- a/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c +++ b/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c @@ -26,6 +26,7 @@ #include /* Since we request GPIOs from ourself */ #include +#include #include "core.h" @@ -1187,7 +1188,11 @@ static struct irq_chip gpio_irqchip = { .irq_set_type = gpio_irq_type, }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) +#else +static void gpio_irq_handler(struct irq_desc *desc) +#endif { struct irq_chip *chip = irq_desc_get_chip(desc); struct irq_data *idata = irq_desc_get_irq_data(desc); @@ -1228,7 +1233,9 @@ static int oxnas_gpio_irq_map(struct irq_domain *h, unsigned int virq, irq_set_lockdep_class(virq, &gpio_lock_class); irq_set_chip_and_handler(virq, &gpio_irqchip, handle_edge_irq); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) set_irq_flags(virq, IRQF_VALID); +#endif irq_set_chip_data(virq, oxnas_gpio); return 0; -- 2.11.0