diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-10 16:07:50 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-10 16:07:50 +0000 |
| commit | 9e4323e0cd42ba92f40243b594cd0519de933e63 (patch) | |
| tree | 267433ab2e69d5086f046e9b045cb4c17862b14f | |
| parent | e812a241952fdf6c3f03c4b0eb0aeaf0c43cffdd (diff) | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36308 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch | 23 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch | 23 |
2 files changed, 46 insertions, 0 deletions
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; |