Commit 80124df1 authored by Mikhail Kshevetskiy's avatar Mikhail Kshevetskiy Committed by Wolfgang Denk
Browse files

PXA: fix MDREFR[APD] bit setting



pxa_mem_setup macro use r6 to store CONFIG_SYS_MDREFR_VAL during memory
initialization. This reg is modified during execution of pxa_wait_ticks.
Later we use r6 to setup MDREFR[APD] bit. As result MDREFR[APD] is always
zero.
Signed-off-by: default avatarMikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
parent 11934fbf
...@@ -102,7 +102,11 @@ ...@@ -102,7 +102,11 @@
/* /*
* This macro sets up the Memory controller of the PXA2xx CPU * This macro sets up the Memory controller of the PXA2xx CPU
* *
* Clobbered regs: r3, r4, r5 * WARNING: This macro uses internally r3 and r7 regs for MEMC_BASE
* and CONFIG_SYS_MDREFR_VAL correspondingly. Please do not
* use this regs for other purpose inside this macro.
*
* Clobbered regs: r3, r4, r5, r6, r7
*/ */
.macro pxa_mem_setup .macro pxa_mem_setup
/* This comes handy when setting MDREFR */ /* This comes handy when setting MDREFR */
...@@ -157,7 +161,7 @@ ...@@ -157,7 +161,7 @@
bic r5, r5, #0xf00 /* MDREFR user config with zeroed DRI */ bic r5, r5, #0xf00 /* MDREFR user config with zeroed DRI */
ldr r4, =CONFIG_SYS_MDREFR_VAL ldr r4, =CONFIG_SYS_MDREFR_VAL
mov r6, r4 mov r7, r4
lsl r4, #20 lsl r4, #20
lsr r4, #20 /* Get a valid DRI field */ lsr r4, #20 /* Get a valid DRI field */
...@@ -187,12 +191,12 @@ ...@@ -187,12 +191,12 @@
* 6) Initialize SDRAM * 6) Initialize SDRAM
*/ */
bic r6, #MDREFR_SLFRSH bic r7, #MDREFR_SLFRSH
str r6, [r3, #MDREFR_OFFSET] str r7, [r3, #MDREFR_OFFSET]
ldr r4, [r3, #MDREFR_OFFSET] ldr r4, [r3, #MDREFR_OFFSET]
orr r6, #MDREFR_E1PIN orr r7, #MDREFR_E1PIN
str r6, [r3, #MDREFR_OFFSET] str r7, [r3, #MDREFR_OFFSET]
ldr r4, [r3, #MDREFR_OFFSET] ldr r4, [r3, #MDREFR_OFFSET]
/* /*
...@@ -250,8 +254,8 @@ ...@@ -250,8 +254,8 @@
*/ */
ldr r4, [r3, #MDREFR_OFFSET] ldr r4, [r3, #MDREFR_OFFSET]
and r6, r6, #MDREFR_APD and r7, r7, #MDREFR_APD
orr r4, r4, r6 orr r4, r4, r7
str r4, [r3, #MDREFR_OFFSET] str r4, [r3, #MDREFR_OFFSET]
ldr r4, [r3, #MDREFR_OFFSET] ldr r4, [r3, #MDREFR_OFFSET]
.endm .endm
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment