summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-01-30 11:03:49 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-02-24 13:24:58 +0900
commit689189fb014203965ed89833d8d5566424540c9d (patch)
treea426beea3ac939c418647f99c9a4c47e510079fc
parent35eb304b5cd7b49d581bda79218b8134f3b689ea (diff)
downloadlinux-3.10-689189fb014203965ed89833d8d5566424540c9d.tar.gz
linux-3.10-689189fb014203965ed89833d8d5566424540c9d.tar.bz2
linux-3.10-689189fb014203965ed89833d8d5566424540c9d.zip
ARM: mach-shmobile: sh73a0 PSTR 32-bit access fix
Convert the sh73a0 SMP code to use 32-bit PSTR access. This fixes wakeup from deep sleep for sh73a0 secondary CPUs. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/arm/mach-shmobile/smp-sh73a0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index 0d159d64a34..2d0d4212be4 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -80,7 +80,7 @@ int __cpuinit sh73a0_boot_secondary(unsigned int cpu)
/* enable cache coherency */
modify_scu_cpu_psr(0, 3 << (cpu * 8));
- if (((__raw_readw(__io(PSTR)) >> (4 * cpu)) & 3) == 3)
+ if (((__raw_readl(__io(PSTR)) >> (4 * cpu)) & 3) == 3)
__raw_writel(1 << cpu, __io(WUPCR)); /* wake up */
else
__raw_writel(1 << cpu, __io(SRESCR)); /* reset */