diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-02-28 06:35:33 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-02-28 06:35:33 -0500 |
commit | ad849a223f912bfd6c666e0414d0ff368a9dc1a7 (patch) | |
tree | 795505232789fcda947c579df4a41862e7e63ae5 /arch/arm/mach-exynos4/hotplug.c | |
parent | 9c0ff728b86361f4b5c58b9acf9853d682a1b8f8 (diff) |
ARM: EXYNOS4: Fix wrong constants in the hotplug assembly code.
This patch fixes wrong constants in the hotplug assembly code for
Exynos4 such as Russell's changing in vexpress hotplug and fixes
hard-coded control register constatns also.
Reported-by: Changhwan Youn <chaos.youn@samsung.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos4/hotplug.c')
-rw-r--r-- | arch/arm/mach-exynos4/hotplug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos4/hotplug.c b/arch/arm/mach-exynos4/hotplug.c index 4c42f9ce1c53..2b5909e2ccd3 100644 --- a/arch/arm/mach-exynos4/hotplug.c +++ b/arch/arm/mach-exynos4/hotplug.c | |||
@@ -30,13 +30,13 @@ static inline void cpu_enter_lowpower(void) | |||
30 | * Turn off coherency | 30 | * Turn off coherency |
31 | */ | 31 | */ |
32 | " mrc p15, 0, %0, c1, c0, 1\n" | 32 | " mrc p15, 0, %0, c1, c0, 1\n" |
33 | " bic %0, %0, #0x20\n" | 33 | " bic %0, %0, %3\n" |
34 | " mcr p15, 0, %0, c1, c0, 1\n" | 34 | " mcr p15, 0, %0, c1, c0, 1\n" |
35 | " mrc p15, 0, %0, c1, c0, 0\n" | 35 | " mrc p15, 0, %0, c1, c0, 0\n" |
36 | " bic %0, %0, %2\n" | 36 | " bic %0, %0, %2\n" |
37 | " mcr p15, 0, %0, c1, c0, 0\n" | 37 | " mcr p15, 0, %0, c1, c0, 0\n" |
38 | : "=&r" (v) | 38 | : "=&r" (v) |
39 | : "r" (0), "Ir" (CR_C) | 39 | : "r" (0), "Ir" (CR_C), "Ir" (0x40) |
40 | : "cc"); | 40 | : "cc"); |
41 | } | 41 | } |
42 | 42 | ||
@@ -49,10 +49,10 @@ static inline void cpu_leave_lowpower(void) | |||
49 | " orr %0, %0, %1\n" | 49 | " orr %0, %0, %1\n" |
50 | " mcr p15, 0, %0, c1, c0, 0\n" | 50 | " mcr p15, 0, %0, c1, c0, 0\n" |
51 | " mrc p15, 0, %0, c1, c0, 1\n" | 51 | " mrc p15, 0, %0, c1, c0, 1\n" |
52 | " orr %0, %0, #0x20\n" | 52 | " orr %0, %0, %2\n" |
53 | " mcr p15, 0, %0, c1, c0, 1\n" | 53 | " mcr p15, 0, %0, c1, c0, 1\n" |
54 | : "=&r" (v) | 54 | : "=&r" (v) |
55 | : "Ir" (CR_C) | 55 | : "Ir" (CR_C), "Ir" (0x40) |
56 | : "cc"); | 56 | : "cc"); |
57 | } | 57 | } |
58 | 58 | ||