mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 17:56:15 +02:00
4d759b723b
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27493 3c298f89-4303-0410-b956-a3cf2f4a3e73
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
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);
|
|
}
|
|
|
|
/*
|