forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clocksource: convert MXS timrotv2 to 32-bit down counting clocksource

Browse source 
Convert the MXS timrotv2 32-bit down counting clocksource to the
generic clocksource infrastructure.

Cc: Sascha Hauer <kernel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-05-08 17:21:49 +01:00
parent d6e15d7853
commit 5c61ddcfaf
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/Kconfig
View file

@ -376,6 +376,7 @@ config ARCH_MXS
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select CLKSRC_MMIO
help help
Support for Freescale MXS-based family of processors Support for Freescale MXS-based family of processors

20
arch/arm/mach-mxs/timer.c
View file

@ -101,11 +101,6 @@ static cycle_t timrotv1_get_cycles(struct clocksource *cs)
& 0xffff0000) >> 16); & 0xffff0000) >> 16);
} }
static cycle_t timrotv2_get_cycles(struct clocksource *cs)
{
return ~__raw_readl(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1));
}
static int timrotv1_set_next_event(unsigned long evt, static int timrotv1_set_next_event(unsigned long evt,
struct clock_event_device *dev) struct clock_event_device *dev)
{ {
@ -230,8 +225,8 @@ static int __init mxs_clockevent_init(struct clk *timer_clk)
static struct clocksource clocksource_mxs = { static struct clocksource clocksource_mxs = {
.name = "mxs_timer", .name = "mxs_timer",
.rating = 200, .rating = 200,
.read = timrotv2_get_cycles, .read = timrotv1_get_cycles,
.mask = CLOCKSOURCE_MASK(32), .mask = CLOCKSOURCE_MASK(16),
.flags = CLOCK_SOURCE_IS_CONTINUOUS, .flags = CLOCK_SOURCE_IS_CONTINUOUS,
}; };
@ -239,12 +234,11 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
{ {
unsigned int c = clk_get_rate(timer_clk); unsigned int c = clk_get_rate(timer_clk);
if (timrot_is_v1()) { if (timrot_is_v1())
clocksource_mxs.read = timrotv1_get_cycles; clocksource_register_hz(&clocksource_mxs, c);
clocksource_mxs.mask = CLOCKSOURCE_MASK(16); else
} clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1),
"mxs_timer", c, 200, 32, clocksource_mmio_readl_down);
clocksource_register_hz(&clocksource_mxs, c);
return 0; return 0;
} }