diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/arm920t/ks8695/timer.c | 16 | ||||
-rw-r--r-- | arch/arm/cpu/pxa/cpu.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c index 234fe913e9..0852502f91 100644 --- a/arch/arm/cpu/arm920t/ks8695/timer.c +++ b/arch/arm/cpu/arm920t/ks8695/timer.c @@ -24,6 +24,14 @@ #include <asm/arch/platform.h> /* + * Initial timer set constants. Nothing complicated, just set for a 1ms + * tick. + */ +#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_1) +#define TIMER_COUNT (TIMER_INTERVAL / 2) +#define TIMER_PULSE TIMER_COUNT + +/* * Handy KS8695 register access functions. */ #define ks8695_read(a) *((volatile ulong *) (KS8695_IO_BASE + (a))) @@ -42,14 +50,6 @@ int timer_init (void) return 0; } -/* - * Initial timer set constants. Nothing complicated, just set for a 1ms - * tick. - */ -#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_1) -#define TIMER_COUNT (TIMER_INTERVAL / 2) -#define TIMER_PULSE TIMER_COUNT - ulong get_timer_masked(void) { /* Check for timer wrap */ diff --git a/arch/arm/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c index 9970a4b45b..df351c7fbc 100644 --- a/arch/arm/cpu/pxa/cpu.c +++ b/arch/arm/cpu/pxa/cpu.c @@ -305,7 +305,7 @@ void pxa_wakeup(void) pxa_dram_init(); icache_disable(); dcache_disable(); - asm volatile("mov pc, %0"::"r"(readl(PSSR))); + asm volatile("mov pc, %0"::"r"(readl(PSPR))); } } |