projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
b52da2a
)
Merge branch 'master' of git://git.denx.de/u-boot-sh
author
Wolfgang Denk
<wd@denx.de>
Mon, 21 Mar 2011 20:38:29 +0000
(21:38 +0100)
committer
Wolfgang Denk
<wd@denx.de>
Mon, 21 Mar 2011 20:38:29 +0000
(21:38 +0100)
arch/powerpc/cpu/mpc85xx/mp.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/cpu/mpc85xx/mp.c
b/arch/powerpc/cpu/mpc85xx/mp.c
index
6c0da83
..
758e6d7
100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/mp.c
+++ b/
arch/powerpc/cpu/mpc85xx/mp.c
@@
-276,8
+276,13
@@
static void plat_mp_up(unsigned long bootpg)
/* enable time base at the platform */
out_be32(&rcpm->ctbenrl, 0);
+
+ /* readback to sync write */
+ in_be32(&rcpm->ctbenrl);
+
mtspr(SPRN_TBWU, 0);
mtspr(SPRN_TBWL, 0);
+
out_be32(&rcpm->ctbenrl, (1 << nr_cpus) - 1);
#ifdef CONFIG_MPC8xxx_DISABLE_BPTR
@@
-347,6
+352,10
@@
static void plat_mp_up(unsigned long bootpg)
else
devdisr |= MPC85xx_DEVDISR_TB0;
out_be32(&gur->devdisr, devdisr);
+
+ /* readback to sync write */
+ in_be32(&gur->devdisr);
+
mtspr(SPRN_TBWU, 0);
mtspr(SPRN_TBWL, 0);