Skip to content

Commit

Permalink
clocksource: convert W90x900 24-bit down counting clocksource
Browse files Browse the repository at this point in the history
Convert the W90x900 24-bit down-counting clocksource to the generic
mmio clocksource infrastructure

Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed May 23, 2011
1 parent bfe45e0 commit 6fa5d5f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
1 change: 1 addition & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@ config ARCH_W90X900
select CPU_ARM926T
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS
help
Support for Nuvoton (Winbond logic dept.) ARM9 processor,
Expand Down
17 changes: 2 additions & 15 deletions arch/arm/mach-w90x900/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#define PRESCALE 0x63 /* Divider = prescale + 1 */

#define TDR_SHIFT 24
#define TDR_MASK ((1 << TDR_SHIFT) - 1)

static unsigned int timer0_load;

Expand Down Expand Up @@ -143,19 +142,6 @@ static void __init nuc900_clockevents_init(void)
clockevents_register_device(&nuc900_clockevent_device);
}

static cycle_t nuc900_get_cycles(struct clocksource *cs)
{
return (~__raw_readl(REG_TDR1)) & TDR_MASK;
}

static struct clocksource clocksource_nuc900 = {
.name = "nuc900-timer1",
.rating = 200,
.read = nuc900_get_cycles,
.mask = CLOCKSOURCE_MASK(TDR_SHIFT),
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};

static void __init nuc900_clocksource_init(void)
{
unsigned int val;
Expand All @@ -175,7 +161,8 @@ static void __init nuc900_clocksource_init(void)
val |= (COUNTEN | PERIOD | PRESCALE);
__raw_writel(val, REG_TCSR1);

clocksource_register_hz(&clocksource_nuc900, rate);
clocksource_mmio_init(REG_TDR1, "nuc900-timer1", rate, 200,
TDR_SHIFT, clocksource_mmio_readl_down);
}

static void __init nuc900_timer_init(void)
Expand Down

0 comments on commit 6fa5d5f

Please sign in to comment.