summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-20 09:37:09 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-20 09:37:09 +0200
commitd3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96 (patch)
tree605af42f8834ea0b793e7febe4aba5d899e5f160 /cpu
parentfcd69a1a57fb2af4d26201422095a4be9f36963e (diff)
parent33eac2b3d946fc998a09245dfe54d017079b9056 (diff)
Merge branch 'next' of git://git.denx.de/u-boot-avr32
Conflicts: MAINTAINERS
Diffstat (limited to 'cpu')
-rw-r--r--cpu/at32ap/at32ap700x/sm.h2
-rw-r--r--cpu/at32ap/cpu.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/cpu/at32ap/at32ap700x/sm.h b/cpu/at32ap/at32ap700x/sm.h
index 6492c8e81d2..b6e4409b220 100644
--- a/cpu/at32ap/at32ap700x/sm.h
+++ b/cpu/at32ap/at32ap700x/sm.h
@@ -21,7 +21,7 @@
#define SM_PM_IMR 0x0048
#define SM_PM_ISR 0x004c
#define SM_PM_ICR 0x0050
-#define SM_PM_GCCTRL 0x0060
+#define SM_PM_GCCTRL(x) (0x0060 + 4 * x)
#define SM_RTC_CTRL 0x0080
#define SM_RTC_VAL 0x0084
#define SM_RTC_TOP 0x0088
diff --git a/cpu/at32ap/cpu.c b/cpu/at32ap/cpu.c
index 0ba836180e4..1a1370289d5 100644
--- a/cpu/at32ap/cpu.c
+++ b/cpu/at32ap/cpu.c
@@ -65,6 +65,9 @@ int cpu_init(void)
sysreg_write(EVBA, (unsigned long)&_evba);
asm volatile("csrf %0" : : "i"(SYSREG_EM_OFFSET));
+ if(gclk_init)
+ gclk_init();
+
return 0;
}