Remove volatiles and memory mapped structure accesses from the davinci cpu timer.c functions and replace with readl and writel macro usage.

Signed-off-by: Nick Thompson nick.thompson@gefanuc.com --- This patch was originally part of the da830 support patch, but this effort is now being integrated into davinci. As a result, these changes would be have been lost, as no change is required for da830. The changes where request to be kept available however, so here they are.

cpu/arm926ejs/davinci/timer.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cpu/arm926ejs/davinci/timer.c b/cpu/arm926ejs/davinci/timer.c index 80751ad..2b22eef 100644 --- a/cpu/arm926ejs/davinci/timer.c +++ b/cpu/arm926ejs/davinci/timer.c @@ -1,4 +1,8 @@ /* + * Copyright (C) 2009 Nick Thompson, GE Fanuc, Ltd. nick.thompson@gefanuc.com + * + * Coding style changes. Use writel and readl for hardware accesses. + * * (C) Copyright 2003 * Texas Instruments <www.ti.com> * @@ -38,8 +42,9 @@ */

#include <common.h> +#include <asm/io.h>

-typedef volatile struct { +typedef struct { u_int32_t pid12; u_int32_t emumgt; u_int32_t na1; @@ -53,7 +58,7 @@ typedef volatile struct { u_int32_t wdtcr; } davinci_timer;

-davinci_timer *timer = (davinci_timer *)CONFIG_SYS_TIMERBASE; +static davinci_timer * const timer = (davinci_timer *)CONFIG_SYS_TIMERBASE;

#define TIMER_LOAD_VAL (CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ) #define TIM_CLK_DIV 16 @@ -64,30 +69,30 @@ static ulong lastinc; int timer_init(void) { /* We are using timer34 in unchained 32-bit mode, full speed */ - timer->tcr = 0x0; - timer->tgcr = 0x0; - timer->tgcr = 0x06 | ((TIM_CLK_DIV - 1) << 8); - timer->tim34 = 0x0; - timer->prd34 = TIMER_LOAD_VAL; + writel(0x0, &timer->tcr); + writel(0x0, &timer->tgcr); + writel(0x06 | ((TIM_CLK_DIV - 1) << 8), &timer->tgcr); + writel(0x0, &timer->tim34); + writel(TIMER_LOAD_VAL, &timer->prd34); lastinc = 0; timestamp = 0; - timer->tcr = 2 << 22; + writel(2 << 22, &timer->tcr);

return(0); }

void reset_timer(void) { - timer->tcr = 0x0; - timer->tim34 = 0; + writel(0x0, &timer->tcr); + writel(0x0, &timer->tim34); lastinc = 0; timestamp = 0; - timer->tcr = 2 << 22; + writel(2 << 22, &timer->tcr); }

static ulong get_timer_raw(void) { - ulong now = timer->tim34; + ulong now = readl(&timer->tim34);

if (now >= lastinc) { /* normal mode */