diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2016-07-18 18:32:48 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2016-07-18 18:35:32 +0200 |
| commit | c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16 (patch) | |
| tree | d3f814a4a85f72d5093ba49c3518c8e7e46e9f33 /target/linux/oxnas/files/drivers/irqchip | |
| parent | 56f686b7107b17341e6357e31435237e6fb1bb0c (diff) | |
| download | upstream-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.tar.gz upstream-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.tar.bz2 upstream-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/irqchip')
| -rw-r--r-- | target/linux/oxnas/files/drivers/irqchip/irq-rps.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/target/linux/oxnas/files/drivers/irqchip/irq-rps.c b/target/linux/oxnas/files/drivers/irqchip/irq-rps.c index f2b0829de6..1e75ea12be 100644 --- a/target/linux/oxnas/files/drivers/irqchip/irq-rps.c +++ b/target/linux/oxnas/files/drivers/irqchip/irq-rps.c @@ -6,7 +6,13 @@ #include <linux/irqchip/chained_irq.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/irqchip.h> +#include <linux/version.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) +# include "irqchip.h" +#else +# include <linux/irqchip.h> +#endif struct rps_chip_data { void __iomem *base; @@ -56,7 +62,11 @@ static int rps_irq_domain_xlate(struct irq_domain *d, unsigned long *out_hwirq, unsigned int *out_type) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + if (d->of_node != controller) +#else if (irq_domain_get_of_node(d) != controller) +#endif return -EINVAL; if (intsize < 1) return -EINVAL; @@ -72,7 +82,11 @@ static int rps_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) { irq_set_chip_and_handler(irq, &rps_chip, handle_level_irq); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); +#else irq_set_probe(irq); +#endif irq_set_chip_data(irq, d->host_data); return 0; } @@ -82,7 +96,11 @@ const struct irq_domain_ops rps_irq_domain_ops = { .xlate = rps_irq_domain_xlate, }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) +static void rps_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) +#else static void rps_handle_cascade_irq(struct irq_desc *desc) +#endif { struct rps_chip_data *chip_data = irq_desc_get_handler_data(desc); struct irq_chip *chip = irq_desc_get_chip(desc); @@ -96,7 +114,11 @@ static void rps_handle_cascade_irq(struct irq_desc *desc) cascade_irq = irq_find_mapping(chip_data->domain, rps_irq); if (unlikely(rps_irq >= RPS_IRQ_COUNT)) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + handle_bad_irq(cascade_irq, desc); +#else handle_bad_irq(desc); +#endif else generic_handle_irq(cascade_irq); |