|
@@ -36,9 +36,9 @@
|
|
/* reconfigure L2 cache aux control reg */
|
|
/* reconfigure L2 cache aux control reg */
|
|
mov r0, #0xC0 /* tag RAM */
|
|
mov r0, #0xC0 /* tag RAM */
|
|
add r0, r0, #0x4 /* data RAM */
|
|
add r0, r0, #0x4 /* data RAM */
|
|
- orr r0, r0, #(1 << 24) /* disable write allocate delay */
|
|
|
|
- orr r0, r0, #(1 << 23) /* disable write allocate combine */
|
|
|
|
- orr r0, r0, #(1 << 22) /* disable write allocate */
|
|
|
|
|
|
+ orr r0, r0, #1 << 24 /* disable write allocate delay */
|
|
|
|
+ orr r0, r0, #1 << 23 /* disable write allocate combine */
|
|
|
|
+ orr r0, r0, #1 << 22 /* disable write allocate */
|
|
|
|
|
|
#if defined(CONFIG_MX51)
|
|
#if defined(CONFIG_MX51)
|
|
ldr r1, =0x0
|
|
ldr r1, =0x0
|
|
@@ -46,7 +46,7 @@
|
|
cmp r3, #0x10
|
|
cmp r3, #0x10
|
|
|
|
|
|
/* disable write combine for TO 2 and lower revs */
|
|
/* disable write combine for TO 2 and lower revs */
|
|
- orrls r0, r0, #(1 << 25)
|
|
|
|
|
|
+ orrls r0, r0, #1 << 25
|
|
#endif
|
|
#endif
|
|
|
|
|
|
mcr 15, 1, r0, c9, c0, 2
|
|
mcr 15, 1, r0, c9, c0, 2
|
|
@@ -247,9 +247,9 @@
|
|
movhi r1, #0
|
|
movhi r1, #0
|
|
#else
|
|
#else
|
|
mov r1, #0
|
|
mov r1, #0
|
|
-
|
|
|
|
#endif
|
|
#endif
|
|
str r1, [r0, #CLKCTL_CACRR]
|
|
str r1, [r0, #CLKCTL_CACRR]
|
|
|
|
+
|
|
/* Switch ARM back to PLL 1 */
|
|
/* Switch ARM back to PLL 1 */
|
|
mov r1, #0
|
|
mov r1, #0
|
|
str r1, [r0, #CLKCTL_CCSR]
|
|
str r1, [r0, #CLKCTL_CCSR]
|
|
@@ -288,9 +288,9 @@
|
|
/* Switch peripheral to PLL2 */
|
|
/* Switch peripheral to PLL2 */
|
|
ldr r0, =CCM_BASE_ADDR
|
|
ldr r0, =CCM_BASE_ADDR
|
|
ldr r1, =0x00808145
|
|
ldr r1, =0x00808145
|
|
- orr r1, r1, #(2 << 10)
|
|
|
|
- orr r1, r1, #(0 << 16)
|
|
|
|
- orr r1, r1, #(1 << 19)
|
|
|
|
|
|
+ orr r1, r1, #2 << 10
|
|
|
|
+ orr r1, r1, #0 << 16
|
|
|
|
+ orr r1, r1, #1 << 19
|
|
str r1, [r0, #CLKCTL_CBCDR]
|
|
str r1, [r0, #CLKCTL_CBCDR]
|
|
|
|
|
|
ldr r1, =0x00016154
|
|
ldr r1, =0x00016154
|
|
@@ -331,10 +331,10 @@ ENTRY(lowlevel_init)
|
|
#if defined(CONFIG_MX51)
|
|
#if defined(CONFIG_MX51)
|
|
ldr r0, =GPIO1_BASE_ADDR
|
|
ldr r0, =GPIO1_BASE_ADDR
|
|
ldr r1, [r0, #0x0]
|
|
ldr r1, [r0, #0x0]
|
|
- orr r1, r1, #(1 << 23)
|
|
|
|
|
|
+ orr r1, r1, #1 << 23
|
|
str r1, [r0, #0x0]
|
|
str r1, [r0, #0x0]
|
|
ldr r1, [r0, #0x4]
|
|
ldr r1, [r0, #0x4]
|
|
- orr r1, r1, #(1 << 23)
|
|
|
|
|
|
+ orr r1, r1, #1 << 23
|
|
str r1, [r0, #0x4]
|
|
str r1, [r0, #0x4]
|
|
#endif
|
|
#endif
|
|
|
|
|
|
@@ -351,16 +351,16 @@ ENTRY(lowlevel_init)
|
|
ENDPROC(lowlevel_init)
|
|
ENDPROC(lowlevel_init)
|
|
|
|
|
|
/* Board level setting value */
|
|
/* Board level setting value */
|
|
-W_DP_OP_864: .word DP_OP_864
|
|
|
|
-W_DP_MFD_864: .word DP_MFD_864
|
|
|
|
-W_DP_MFN_864: .word DP_MFN_864
|
|
|
|
-W_DP_MFN_800_DIT: .word DP_MFN_800_DIT
|
|
|
|
-W_DP_OP_800: .word DP_OP_800
|
|
|
|
-W_DP_MFD_800: .word DP_MFD_800
|
|
|
|
-W_DP_MFN_800: .word DP_MFN_800
|
|
|
|
-W_DP_OP_665: .word DP_OP_665
|
|
|
|
-W_DP_MFD_665: .word DP_MFD_665
|
|
|
|
-W_DP_MFN_665: .word DP_MFN_665
|
|
|
|
-W_DP_OP_216: .word DP_OP_216
|
|
|
|
-W_DP_MFD_216: .word DP_MFD_216
|
|
|
|
-W_DP_MFN_216: .word DP_MFN_216
|
|
|
|
|
|
+W_DP_OP_864: .word DP_OP_864
|
|
|
|
+W_DP_MFD_864: .word DP_MFD_864
|
|
|
|
+W_DP_MFN_864: .word DP_MFN_864
|
|
|
|
+W_DP_MFN_800_DIT: .word DP_MFN_800_DIT
|
|
|
|
+W_DP_OP_800: .word DP_OP_800
|
|
|
|
+W_DP_MFD_800: .word DP_MFD_800
|
|
|
|
+W_DP_MFN_800: .word DP_MFN_800
|
|
|
|
+W_DP_OP_665: .word DP_OP_665
|
|
|
|
+W_DP_MFD_665: .word DP_MFD_665
|
|
|
|
+W_DP_MFN_665: .word DP_MFN_665
|
|
|
|
+W_DP_OP_216: .word DP_OP_216
|
|
|
|
+W_DP_MFD_216: .word DP_MFD_216
|
|
|
|
+W_DP_MFN_216: .word DP_MFN_216
|