aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-3.0/010-clocksource_fix.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-07-06 13:03:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-07-06 13:03:38 +0000
commita832965eff3fd8d6540f2c3f12dbd969a55eb8ba (patch)
tree218807ac42818c850dfb82de2f9757d64099087a /target/linux/ixp4xx/patches-3.0/010-clocksource_fix.patch
parenta00596924bdb47bac223851e79208e4f051677f5 (diff)
downloadupstream-a832965eff3fd8d6540f2c3f12dbd969a55eb8ba.tar.gz
upstream-a832965eff3fd8d6540f2c3f12dbd969a55eb8ba.tar.bz2
upstream-a832965eff3fd8d6540f2c3f12dbd969a55eb8ba.zip
add 3.0 support
SVN-Revision: 27493
Diffstat (limited to 'target/linux/ixp4xx/patches-3.0/010-clocksource_fix.patch')
-rw-r--r--target/linux/ixp4xx/patches-3.0/010-clocksource_fix.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-3.0/010-clocksource_fix.patch b/target/linux/ixp4xx/patches-3.0/010-clocksource_fix.patch
new file mode 100644
index 0000000000..ae60a6abee
--- /dev/null
+++ b/target/linux/ixp4xx/patches-3.0/010-clocksource_fix.patch
@@ -0,0 +1,37 @@
+Commit 234b6ceddb4fc2a4bc5b9a7670f070f6e69e0868
+
+ clocksource: convert ARM 32-bit up counting clocksources
+
+broke the build for ixp4xx and made big endian operation impossible.
+This commit restores the original behaviour.
+
+Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
+---
+ arch/arm/mach-ixp4xx/common.c | 10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/mach-ixp4xx/common.c
++++ b/arch/arm/mach-ixp4xx/common.c
+@@ -419,14 +419,20 @@ static void notrace ixp4xx_update_sched_
+ /*
+ * clocksource
+ */
++
++static cycle_t ixp4xx_clocksource_read(struct clocksource *c)
++{
++ return *IXP4XX_OSTS;
++}
++
+ unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;
+ EXPORT_SYMBOL(ixp4xx_timer_freq);
+ static void __init ixp4xx_clocksource_init(void)
+ {
+ init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq);
+
+- clocksource_mmio_init(&IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32,
+- clocksource_mmio_readl_up);
++ clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32,
++ ixp4xx_clocksource_read);
+ }
+
+ /*