diff options
| author | Matthias Kaehlcke <matthias@kaehlcke.net> | 2010-03-09 22:13:47 +0100 |
|---|---|---|
| committer | trix <trix@windriver.com> | 2010-04-03 15:24:26 -0500 |
| commit | 33eef04bf8541f7b15d4f694ad10f9b912b9caa6 (patch) | |
| tree | e4aff04af7a925775156448f999ba742f795bb8d /cpu/arm920t/ep93xx/timer.c | |
| parent | 2528dc52361bea49e6bd4a95ce2374d0004ca56f (diff) | |
| download | u-boot-imx-33eef04bf8541f7b15d4f694ad10f9b912b9caa6.zip u-boot-imx-33eef04bf8541f7b15d4f694ad10f9b912b9caa6.tar.gz u-boot-imx-33eef04bf8541f7b15d4f694ad10f9b912b9caa6.tar.bz2 | |
ep93xx timer: Rename struct timer_reg pointers
ep93xx timer: Renamed pointers to struct timer_regs from name 'timer' to
'timer_regs' in order to avoid confusion with the global variable 'timer'
Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Diffstat (limited to 'cpu/arm920t/ep93xx/timer.c')
| -rw-r--r-- | cpu/arm920t/ep93xx/timer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpu/arm920t/ep93xx/timer.c b/cpu/arm920t/ep93xx/timer.c index 31304b7..943f193 100644 --- a/cpu/arm920t/ep93xx/timer.c +++ b/cpu/arm920t/ep93xx/timer.c @@ -63,9 +63,9 @@ static inline unsigned long long usecs_to_ticks(unsigned long usecs) static inline unsigned long read_timer(void) { - struct timer_regs *timer = (struct timer_regs *)TIMER_BASE; + struct timer_regs *timer_regs = (struct timer_regs *)TIMER_BASE; - return TIMER_MAX_VAL - readl(&timer->timer3.value); + return TIMER_MAX_VAL - readl(&timer_regs->timer3.value); } /* @@ -120,17 +120,17 @@ void __udelay(unsigned long usec) int timer_init(void) { - struct timer_regs *timer = (struct timer_regs *)TIMER_BASE; + struct timer_regs *timer_regs = (struct timer_regs *)TIMER_BASE; /* use timer 3 with 508KHz and free running */ - writel(TIMER_CLKSEL, &timer->timer3.control); + writel(TIMER_CLKSEL, &timer_regs->timer3.control); /* set initial timer value 3 */ - writel(TIMER_MAX_VAL, &timer->timer3.load); + writel(TIMER_MAX_VAL, &timer_regs->timer3.load); /* Enable the timer */ writel(TIMER_ENABLE | TIMER_CLKSEL, - &timer->timer3.control); + &timer_regs->timer3.control); reset_timer_masked(); |