V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

PXA: Use pxa-regs.h register definitions in start.S 

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
This commit is contained in:
Marek Vasut 2010-10-20 20:09:09 +02:00
parent 6e96cf9a81
commit 4abf2f7a23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/cpu/pxa/start.S
View File

@ -566,12 +566,6 @@ fiq:
/* */ /* */
/****************************************************************************/ /****************************************************************************/
/* Operating System Timer */ /* Operating System Timer */
OSTIMER_BASE: .word 0x40a00000
#define OSMR3 0x0C
#define OSCR 0x10
#define OWER 0x18
#define OIER 0x1C
.align 5 .align 5
.globl reset_cpu .globl reset_cpu
@ -582,18 +576,20 @@ reset_cpu:
/* We set OWE:WME (watchdog enable) and wait until timeout happens */ /* We set OWE:WME (watchdog enable) and wait until timeout happens */
ldr r0, OSTIMER_BASE ldr r0, =OWER
ldr r1, [r0, #OWER] ldr r1, [r0]
orr r1, r1, #0x0001 /* bit0: WME */ orr r1, r1, #0x0001 /* bit0: WME */
str r1, [r0, #OWER] str r1, [r0]
/* OS timer does only wrap every 1165 seconds, so we have to set */ /* OS timer does only wrap every 1165 seconds, so we have to set */
/* the match register as well. */ /* the match register as well. */
ldr r1, [r0, #OSCR] /* read OS timer */ ldr r0, =OSCR
ldr r1, [r0] /* read OS timer */
add r1, r1, #0x800 /* let OSMR3 match after */ add r1, r1, #0x800 /* let OSMR3 match after */
add r1, r1, #0x800 /* 4096*(1/3.6864MHz)=1ms */ add r1, r1, #0x800 /* 4096*(1/3.6864MHz)=1ms */
str r1, [r0, #OSMR3] ldr r0, =OSMR3
str r1, [r0]
reset_endless: reset_endless: