From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 18 Jan 2016 23:34:51 +0000 (+0000)
Subject: oxnas: prepare platform and drivers for Linux 4.4
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cee6c07cf32302ad71cc8c540f997b552a3ba4aa;p=openwrt%2Fstaging%2Fjow.git

oxnas: prepare platform and drivers for Linux 4.4

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 48338
---

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;