diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-03 07:25:39 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-20 18:55:16 -0500 |
commit | 12d2b4e5f0c65eaa1d61e4e1bbfb2df41bc6cd9d (patch) | |
tree | 1283d25048a770f01d29208f5a57c1da7b680d29 /arch/arm/mach-ixp4xx | |
parent | 86ce0d2e6f131bd0b5b1b8d32149e008d39b5ea1 (diff) |
ARM: mach-ixp4xx: properly disable CPU idle call
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/system.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 3841ab4146ba..a6329a0a8ec4 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -236,6 +236,12 @@ void __init ixp4xx_init_irq(void) | |||
236 | { | 236 | { |
237 | int i = 0; | 237 | int i = 0; |
238 | 238 | ||
239 | /* | ||
240 | * ixp4xx does not implement the XScale PWRMODE register | ||
241 | * so it must not call cpu_do_idle(). | ||
242 | */ | ||
243 | disable_hlt(); | ||
244 | |||
239 | /* Route all sources to IRQ instead of FIQ */ | 245 | /* Route all sources to IRQ instead of FIQ */ |
240 | *IXP4XX_ICLR = 0x0; | 246 | *IXP4XX_ICLR = 0x0; |
241 | 247 | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/system.h b/arch/arm/mach-ixp4xx/include/mach/system.h index 140a9bef4466..768ac09d0fd2 100644 --- a/arch/arm/mach-ixp4xx/include/mach/system.h +++ b/arch/arm/mach-ixp4xx/include/mach/system.h | |||
@@ -10,10 +10,5 @@ | |||
10 | */ | 10 | */ |
11 | static inline void arch_idle(void) | 11 | static inline void arch_idle(void) |
12 | { | 12 | { |
13 | /* ixp4xx does not implement the XScale PWRMODE register, | ||
14 | * so it must not call cpu_do_idle() here. | ||
15 | */ | ||
16 | #if 0 | ||
17 | cpu_do_idle(); | 13 | cpu_do_idle(); |
18 | #endif | ||
19 | } | 14 | } |