From c5ec5e1f7f33a18ea81d3d9254c5b49bbdfd5e16 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 18 Jul 2016 18:32:48 +0200
Subject: 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>
---
 target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'target/linux/oxnas/files/arch/arm/mach-oxnas')

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)
-- 
cgit v1.2.3