aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2016-07-18 18:32:48 +0200
committerDaniel Golle <daniel@makrotopia.org>2016-07-18 18:35:32 +0200
commitc5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16 (patch)
treed3f814a4a85f72d5093ba49c3518c8e7e46e9f33 /target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
parent56f686b7107b17341e6357e31435237e6fb1bb0c (diff)
downloadupstream-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.tar.gz
upstream-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.tar.bz2
upstream-c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16.zip
oxnas: revert to kernel 4.1
A bug resulting in the NAND not being detected by newer kernels has kept me sleepless for months and yet I wasn't able to discover the cause. Bring back patches and files for 4.1 until this has been resolved. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c')
-rw-r--r--target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c5
1 files changed, 5 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 31b7c90582..4d648c63d2 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,2,0)
+ clocksource_of_init();
+#else
clocksource_probe();
+#endif
}
void ox820_init_early(void)