summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStelian Pop <stelian@popies.net>2008-03-26 21:52:27 +0100
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-04-01 01:44:05 +0200
commit61106a565870ff503f92b251b94bd7afef889a04 (patch)
tree656d36ef304fda96d20c9c8039c8c31bf16c8f2e
parent5604e2178c5218fbfdba2e4293ca7652e829ac25 (diff)
downloadu-boot-imx-61106a565870ff503f92b251b94bd7afef889a04.zip
u-boot-imx-61106a565870ff503f92b251b94bd7afef889a04.tar.gz
u-boot-imx-61106a565870ff503f92b251b94bd7afef889a04.tar.bz2
Use timer_init() instead of board supplied interrupt_init()
The timer on AT91CAP9/AT91SAM9 is supplied by the SoC, and not by the board, so use timer_init() instead of interrupt_init(). Signed-off-by: Stelian Pop <stelian@popies.net>
-rw-r--r--cpu/arm926ejs/at91cap9/timer.c2
-rw-r--r--cpu/arm926ejs/interrupts.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm926ejs/at91cap9/timer.c b/cpu/arm926ejs/at91cap9/timer.c
index 4110e15..c6df5bd 100644
--- a/cpu/arm926ejs/at91cap9/timer.c
+++ b/cpu/arm926ejs/at91cap9/timer.c
@@ -41,7 +41,7 @@ ulong resettime;
AT91PS_PITC p_pitc;
/* nothing really to do with interrupts, just starts up a counter. */
-int interrupt_init(void)
+int timer_init(void)
{
/*
* Enable PITC Clock
diff --git a/cpu/arm926ejs/interrupts.c b/cpu/arm926ejs/interrupts.c
index 0971fea..1819f6b 100644
--- a/cpu/arm926ejs/interrupts.c
+++ b/cpu/arm926ejs/interrupts.c
@@ -38,7 +38,7 @@
#include <common.h>
#include <arm926ejs.h>
-#if defined(CONFIG_INTEGRATOR) || defined(CONFIG_AT91CAP9ADK)
+#ifdef CONFIG_INTEGRATOR
/* Timer functionality supplied by Integrator board (AP or CP) */