| From 0a9ecd90d97895db2561a1dbaa0d106b293c52e0 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Mon, 30 Jan 2012 11:03:49 +0900 |
| Subject: 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> |
| (cherry picked from commit 689189fb014203965ed89833d8d5566424540c9d) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c |
| index be1ade7..55d58c5 100644 |
| --- a/arch/arm/mach-shmobile/smp-sh73a0.c |
| +++ b/arch/arm/mach-shmobile/smp-sh73a0.c |
| @@ -79,7 +79,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 */ |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |
