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 718bad7194aa3822ee147523557bdf232eee5f63..2a8ada81bffc8f87176785c83ec0486a7a32a9e8 100644 (file)
--- 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 48b5d6865ddd2f191d795cd2c96f1dd93035d11b..2c4f6889e8b5fd1116a44d1b72758cbe59d7cfe2 100644 (file)
--- 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;