From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 10 Apr 2013 16:07:50 +0000 (+0000)
Subject: kernel: calibrate the TWD timer even when booting with only one CPU, it is used for... 
X-Git-Tag: reboot~10681
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=edd8048107d1c96775b4ce372a24ff5daba05eae;p=openwrt%2Fstaging%2Fnoltari.git

kernel: calibrate the TWD timer even when booting with only one CPU, it is used for the watchdog timer base

Fixes booting on single-core CNS3xxx devices

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36308
---

diff --git a/target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch b/target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch
new file mode 100644
index 0000000000..bd5cf52324
--- /dev/null
+++ b/target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch
@@ -0,0 +1,23 @@
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -189,7 +189,7 @@ core_initcall(twd_cpufreq_init);
+ 
+ #endif
+ 
+-static void __cpuinit twd_calibrate_rate(void)
++static int twd_calibrate_rate(void)
+ {
+ 	unsigned long count;
+ 	u64 waitjiffies;
+@@ -226,8 +226,11 @@ static void __cpuinit twd_calibrate_rate
+ 		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
+ 			(twd_timer_rate / 10000) % 100);
+ 	}
++	return 0;
+ }
+ 
++device_initcall(twd_calibrate_rate);
++
+ static irqreturn_t twd_handler(int irq, void *dev_id)
+ {
+ 	struct clock_event_device *evt = *(struct clock_event_device **)dev_id;
diff --git a/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch b/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch
new file mode 100644
index 0000000000..447aaca5bc
--- /dev/null
+++ b/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch
@@ -0,0 +1,23 @@
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -186,7 +186,7 @@ core_initcall(twd_cpufreq_init);
+ 
+ #endif
+ 
+-static void __cpuinit twd_calibrate_rate(void)
++static int twd_calibrate_rate(void)
+ {
+ 	unsigned long count;
+ 	u64 waitjiffies;
+@@ -223,8 +223,11 @@ static void __cpuinit twd_calibrate_rate
+ 		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
+ 			(twd_timer_rate / 10000) % 100);
+ 	}
++	return 0;
+ }
+ 
++device_initcall(twd_calibrate_rate);
++
+ static irqreturn_t twd_handler(int irq, void *dev_id)
+ {
+ 	struct clock_event_device *evt = *(struct clock_event_device **)dev_id;