| 1 | Commit 234b6ceddb4fc2a4bc5b9a7670f070f6e69e0868 |
| 2 | |
| 3 | clocksource: convert ARM 32-bit up counting clocksources |
| 4 | |
| 5 | broke the build for ixp4xx and made big endian operation impossible. |
| 6 | This commit restores the original behaviour. |
| 7 | |
| 8 | Signed-off-by: Richard Cochran <richard.cochran@omicron.at> |
| 9 | --- |
| 10 | arch/arm/mach-ixp4xx/common.c | 10 ++++++++-- |
| 11 | 1 files changed, 8 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | --- a/arch/arm/mach-ixp4xx/common.c |
| 14 | +++ b/arch/arm/mach-ixp4xx/common.c |
| 15 | @@ -419,14 +419,20 @@ static void notrace ixp4xx_update_sched_ |
| 16 | /* |
| 17 | * clocksource |
| 18 | */ |
| 19 | + |
| 20 | +static cycle_t ixp4xx_clocksource_read(struct clocksource *c) |
| 21 | +{ |
| 22 | + return *IXP4XX_OSTS; |
| 23 | +} |
| 24 | + |
| 25 | unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ; |
| 26 | EXPORT_SYMBOL(ixp4xx_timer_freq); |
| 27 | static void __init ixp4xx_clocksource_init(void) |
| 28 | { |
| 29 | init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq); |
| 30 | |
| 31 | - clocksource_mmio_init(&IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32, |
| 32 | - clocksource_mmio_readl_up); |
| 33 | + clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32, |
| 34 | + ixp4xx_clocksource_read); |
| 35 | } |
| 36 | |
| 37 | /* |
| 38 | |
