From: khc@pm.waw.pl (Krzysztof Halasa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: fix regression in IXP4xx clocksource
Date: Wed, 06 Jul 2011 23:02:17 +0200 [thread overview]
Message-ID: <m3liwb15t2.fsf@intrepid.localdomain> (raw)
From: Richard Cochran <richardcochran@gmail.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.
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: Krzysztof Ha?asa <khc@pm.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);
}
/*
next reply other threads:[~2011-07-06 21:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-06 21:02 Krzysztof Halasa [this message]
2011-07-06 21:14 ` [PATCH] ARM: fix regression in IXP4xx clocksource Russell King - ARM Linux
2011-07-07 7:06 ` Krzysztof Halasa
2011-07-12 8:05 ` Richard Cochran
2011-07-12 8:32 ` Russell King - ARM Linux
-- strict thread matches above, loose matches on Subject: below --
2011-05-30 8:43 [PATCH] arm: fix regression in ixp4xx clocksource Richard Cochran
2011-06-01 15:08 ` Krzysztof Halasa
2011-06-01 17:02 ` Richard Cochran
2011-06-06 8:43 ` Krzysztof Halasa
2011-06-01 22:58 ` Russell King - ARM Linux
2011-06-01 23:09 ` Thomas Gleixner
2011-07-04 9:21 ` Thomas Gleixner
2011-07-07 6:59 ` Krzysztof Halasa
2011-06-11 5:15 ` Richard Cochran
2011-06-11 11:22 ` Mikael Pettersson
2011-06-11 12:49 ` Richard Cochran
2011-06-11 13:18 ` Mikael Pettersson
2011-06-26 13:08 ` Krzysztof Halasa
2011-06-12 13:51 ` Russell King - ARM Linux
2011-06-13 5:58 ` Richard Cochran
2011-06-26 13:38 ` Krzysztof Halasa
2011-06-28 13:10 ` Richard Cochran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3liwb15t2.fsf@intrepid.localdomain \
--to=khc@pm.waw.pl \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox