summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/arm926ejs/at91/timer.c
diff options
context:
space:
mode:
authorReinhard Meyer <u-boot@emk-elektronik.de>2010-11-03 15:39:55 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-05-18 07:56:51 +0200
commit9f3fe90f094d4ad6309b5222196d0f8c783784b0 (patch)
tree002870df6ec347a916132c048004c11eb45f749a /arch/arm/cpu/arm926ejs/at91/timer.c
parent83f1072e06d4e3b9eaceed39799042c7b3bbdbb1 (diff)
downloadtalos-obmc-uboot-9f3fe90f094d4ad6309b5222196d0f8c783784b0.tar.gz
talos-obmc-uboot-9f3fe90f094d4ad6309b5222196d0f8c783784b0.zip
AT91: fix related at91 system/driver files
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/at91/timer.c')
-rw-r--r--arch/arm/cpu/arm926ejs/at91/timer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/timer.c b/arch/arm/cpu/arm926ejs/at91/timer.c
index 82b8d7e7d7..263441810b 100644
--- a/arch/arm/cpu/arm926ejs/at91/timer.c
+++ b/arch/arm/cpu/arm926ejs/at91/timer.c
@@ -70,11 +70,11 @@ static inline unsigned long long usec_to_tick(unsigned long long usec)
*/
int timer_init(void)
{
- at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE;
- at91_pit_t *pit = (at91_pit_t *) AT91_PIT_BASE;
+ at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
+ at91_pit_t *pit = (at91_pit_t *) ATMEL_BASE_PIT;
/* Enable PITC Clock */
- writel(1 << AT91_ID_SYS, &pmc->pcer);
+ writel(1 << ATMEL_ID_SYS, &pmc->pcer);
/* Enable PITC */
writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr);
@@ -90,7 +90,7 @@ int timer_init(void)
*/
unsigned long long get_ticks(void)
{
- at91_pit_t *pit = (at91_pit_t *) AT91_PIT_BASE;
+ at91_pit_t *pit = (at91_pit_t *) ATMEL_BASE_PIT;
ulong now = readl(&pit->piir);
OpenPOWER on IntegriCloud