[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110712080513.GA2937@riccoc20.at.omicron.at>
Date: Tue, 12 Jul 2011 10:05:13 +0200
From: Richard Cochran <richardcochran@...il.com>
To: Krzysztof Halasa <khc@...waw.pl>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
lkml <linux-kernel@...r.kernel.org>,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH] ARM: fix regression in IXP4xx clocksource
On Wed, Jul 06, 2011 at 11:02:17PM +0200, Krzysztof Halasa wrote:
> From: Richard Cochran <richardcochran@...il.com>
>
> 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.
I know I nag, but can we *please* have this patch in 3.0?
Big endian IXP really, really does not work without it.
Thanks,
Richard
>
> Signed-off-by: Richard Cochran <richard.cochran@...cron.at>
> Signed-off-by: Krzysztof HaĆasa <khc@...waw.pl>
>
> 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);
> }
>
> /*
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists