Author: nbd Date: 2016-01-19 00:34:51 +0100 (Tue, 19 Jan 2016) New Revision: 48338
Modified: trunk/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c trunk/target/linux/oxnas/files/drivers/irqchip/irq-rps.c Log: oxnas: prepare platform and drivers for Linux 4.4 Signed-off-by: Daniel Golle <[email protected]> Modified: trunk/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c =================================================================== --- trunk/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c 2016-01-18 23:34:42 UTC (rev 48337) +++ trunk/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c 2016-01-18 23:34:51 UTC (rev 48338) @@ -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_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) Modified: trunk/target/linux/oxnas/files/drivers/irqchip/irq-rps.c =================================================================== --- trunk/target/linux/oxnas/files/drivers/irqchip/irq-rps.c 2016-01-18 23:34:42 UTC (rev 48337) +++ trunk/target/linux/oxnas/files/drivers/irqchip/irq-rps.c 2016-01-18 23:34:51 UTC (rev 48338) @@ -62,7 +62,11 @@ 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; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
