summaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/files/drivers/pinctrl
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2016-07-18 18:32:48 +0200
committerDaniel Golle <daniel@makrotopia.org>2016-07-18 18:35:32 +0200
commitc5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16 (patch)
treed3f814a4a85f72d5093ba49c3518c8e7e46e9f33 /target/linux/oxnas/files/drivers/pinctrl
parent56f686b7107b17341e6357e31435237e6fb1bb0c (diff)
downloadmaster-31e0f0ae-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.tar.gz
master-31e0f0ae-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.tar.bz2
master-31e0f0ae-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.zip
oxnas: revert to kernel 4.1
A bug resulting in the NAND not being detected by newer kernels has kept me sleepless for months and yet I wasn't able to discover the cause. Bring back patches and files for 4.1 until this has been resolved. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/oxnas/files/drivers/pinctrl')
-rw-r--r--target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c b/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c
index 38a8cbb451..034a7304d4 100644
--- a/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c
+++ b/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c
@@ -27,6 +27,7 @@
/* Since we request GPIOs from ourself */
#include <linux/pinctrl/consumer.h>
#include <linux/spinlock.h>
+#include <linux/version.h>
#include "core.h"
@@ -1199,7 +1200,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);
@@ -1240,6 +1245,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;