diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 23:34:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 23:34:51 +0000 |
| commit | cee6c07cf32302ad71cc8c540f997b552a3ba4aa (patch) | |
| tree | f9f66f8caa337721dd0913ad0ab1d23bfaa057ec /target | |
| parent | 354e5cdbe20527e23411d3d1e5e48aa6e08fd846 (diff) | |
| download | upstream-cee6c07cf32302ad71cc8c540f997b552a3ba4aa.tar.gz upstream-cee6c07cf32302ad71cc8c540f997b552a3ba4aa.tar.bz2 upstream-cee6c07cf32302ad71cc8c540f997b552a3ba4aa.zip | |
oxnas: prepare platform and drivers for Linux 4.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 48338
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c | 5 | ||||
| -rw-r--r-- | target/linux/oxnas/files/drivers/irqchip/irq-rps.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c b/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c index 718bad7194..2a8ada81bf 100644 --- a/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c +++ b/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c @@ -8,6 +8,7 @@ #include <linux/slab.h> #include <linux/gfp.h> #include <linux/reset.h> +#include <linux/version.h> #include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/mach/arch.h> @@ -73,7 +74,11 @@ static void __init ox820_dt_init(void) static void __init ox820_timer_init(void) { of_clk_init(NULL); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0) clocksource_of_init(); +#else + clocksource_probe(); +#endif } void ox820_init_early(void) diff --git a/target/linux/oxnas/files/drivers/irqchip/irq-rps.c b/target/linux/oxnas/files/drivers/irqchip/irq-rps.c index 48b5d6865d..2c4f6889e8 100644 --- a/target/linux/oxnas/files/drivers/irqchip/irq-rps.c +++ b/target/linux/oxnas/files/drivers/irqchip/irq-rps.c @@ -62,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,3,0) if (d->of_node != controller) +#else + if (irq_domain_get_of_node(d) != controller) +#endif return -EINVAL; if (intsize < 1) return -EINVAL; |