KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

oxnas: prepare platform and drivers for Linux 4.4

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

SVN-Revision: 48338
This commit is contained in:
Felix Fietkau 2016-01-18 23:34:51 +00:00
parent 354e5cdbe2
commit cee6c07cf3
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
View file

@ -8,6 +8,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/version.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@ -73,7 +74,11 @@ static void __init ox820_dt_init(void)
static void __init ox820_timer_init(void) static void __init ox820_timer_init(void)
{ {
of_clk_init(NULL); of_clk_init(NULL);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
clocksource_of_init(); clocksource_of_init();
#else
clocksource_probe();
#endif
} }
void ox820_init_early(void) void ox820_init_early(void)

4
target/linux/oxnas/files/drivers/irqchip/irq-rps.c
View file

@ -62,7 +62,11 @@ static int rps_irq_domain_xlate(struct irq_domain *d,
unsigned long *out_hwirq, unsigned long *out_hwirq,
unsigned int *out_type) unsigned int *out_type)
{ {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
if (d->of_node != controller) if (d->of_node != controller)
#else
if (irq_domain_get_of_node(d) != controller)
#endif
return -EINVAL; return -EINVAL;
if (intsize < 1) if (intsize < 1)
return -EINVAL; return -EINVAL;