From 02f6abefc7efa966d9339022bd65ea5a644ec2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 9 Dec 2008 21:57:22 +0100 Subject: [PATCH] --- yaml --- r: 123922 b: refs/heads/master c: 24e7857677fe3cb87f1dd7fa1418a73795e9f4c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-netx/time.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d7b2b5f3580b..8a8f523f4be5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9853848860d7ece7d84ac43cfde5390b2638eb89 +refs/heads/master: 24e7857677fe3cb87f1dd7fa1418a73795e9f4c5 diff --git a/trunk/arch/arm/mach-netx/time.c b/trunk/arch/arm/mach-netx/time.c index be833bd1048e..34a6a157f355 100644 --- a/trunk/arch/arm/mach-netx/time.c +++ b/trunk/arch/arm/mach-netx/time.c @@ -27,6 +27,8 @@ #include #include +#define TIMER_CLOCKSOURCE 1 + /* * IRQ handler for the timer */ @@ -49,7 +51,7 @@ static struct irqaction netx_timer_irq = { cycle_t netx_get_cycles(void) { - return readl(NETX_GPIO_COUNTER_CURRENT(1)); + return readl(NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE)); } static struct clocksource clocksource_netx = { @@ -87,12 +89,12 @@ static void __init netx_timer_init(void) setup_irq(NETX_IRQ_TIMER0, &netx_timer_irq); /* Setup timer one for clocksource */ - writel(0, NETX_GPIO_COUNTER_CTRL(1)); - writel(0, NETX_GPIO_COUNTER_CURRENT(1)); - writel(0xffffffff, NETX_GPIO_COUNTER_MAX(1)); + writel(0, NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKSOURCE)); + writel(0, NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE)); + writel(0xffffffff, NETX_GPIO_COUNTER_MAX(TIMER_CLOCKSOURCE)); writel(NETX_GPIO_COUNTER_CTRL_RUN, - NETX_GPIO_COUNTER_CTRL(1)); + NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKSOURCE)); clocksource_netx.mult = clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_netx.shift);