From mboxrd@z Thu Jan 1 00:00:00 1970 From: khc@pm.waw.pl (Krzysztof Halasa) Date: Sun, 26 Jun 2011 15:38:05 +0200 Subject: [PATCH] arm: fix regression in ixp4xx clocksource In-Reply-To: <20110530084307.GA28953@riccoc20.at.omicron.at> (Richard Cochran's message of "Mon, 30 May 2011 10:43:07 +0200") References: <20110530084307.GA28953@riccoc20.at.omicron.at> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org > 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. So, what do we do with this? It would be nice to have the fix in the tree before 3.0. I guess I'll add this if nothing better shows up. Richard Cochran writes: > > Signed-off-by: Richard Cochran > --- > arch/arm/mach-ixp4xx/common.c | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c > index 74ed81a..0777257 100644 > --- a/arch/arm/mach-ixp4xx/common.c > +++ b/arch/arm/mach-ixp4xx/common.c > @@ -419,14 +419,20 @@ static void notrace ixp4xx_update_sched_clock(void) > /* > * 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); > } > > /* -- Krzysztof Halasa