aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaeed Bishara <saeed@marvell.com>2008-07-02 13:06:32 -0400
committerNicolas Pitre <nico@cam.org>2008-07-07 18:38:24 -0400
commit188237e28d7fece0471640ba86f6d8cd164ed085 (patch)
treed96756da27fbe75e602808c2261cad3b70db964e
parent2e1117d307dba8185a72bac94e57f057e70590ca (diff)
[ARM] Feroceon: don't disable BPU on boot
On Feroceon platforms that have a branch prediction unit, bit 11 of the cp15 control register controls the BPU. This patch keeps the old value of this bit instead of always clearing it. Signed-off-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
-rw-r--r--arch/arm/mm/proc-feroceon.S9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index 63ca1ea5c267..f2e5884c513a 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -493,14 +493,15 @@ __feroceon_setup:
493 .size __feroceon_setup, . - __feroceon_setup 493 .size __feroceon_setup, . - __feroceon_setup
494 494
495 /* 495 /*
496 * R 496 * B
497 * .RVI ZFRS BLDP WCAM 497 * R P
498 * .011 0001 ..11 0101 498 * .RVI UFRS BLDP WCAM
499 * .011 .001 ..11 0101
499 * 500 *
500 */ 501 */
501 .type feroceon_crval, #object 502 .type feroceon_crval, #object
502feroceon_crval: 503feroceon_crval:
503 crval clear=0x00007f3f, mmuset=0x00003135, ucset=0x00001134 504 crval clear=0x0000773f, mmuset=0x00003135, ucset=0x00001134
504 505
505 __INITDATA 506 __INITDATA
506 507