diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-03 07:06:05 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-20 18:55:15 -0500 |
| commit | 86ce0d2e6f131bd0b5b1b8d32149e008d39b5ea1 (patch) | |
| tree | 723b82d52f0838f9de1d5822a61b1340bab477ae | |
| parent | 25eb433ab1aaa981cbb43b1d10c0d9377a50e8c9 (diff) | |
| download | linux-stable-86ce0d2e6f131bd0b5b1b8d32149e008d39b5ea1.tar.gz linux-stable-86ce0d2e6f131bd0b5b1b8d32149e008d39b5ea1.tar.bz2 linux-stable-86ce0d2e6f131bd0b5b1b8d32149e008d39b5ea1.zip | |
ARM: mach-ixp23xx: properly disable CPU idle call
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/system.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index 0923bb905cc0..7c1495e4fe7a 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c @@ -441,6 +441,9 @@ static struct platform_device *ixp23xx_devices[] __initdata = { void __init ixp23xx_sys_init(void) { + /* by default, the idle code is disabled */ + disable_hlt(); + *IXP23XX_EXP_UNIT_FUSE |= 0xf; platform_add_devices(ixp23xx_devices, ARRAY_SIZE(ixp23xx_devices)); } diff --git a/arch/arm/mach-ixp23xx/include/mach/system.h b/arch/arm/mach-ixp23xx/include/mach/system.h index 277dda7334b9..69f80006fc80 100644 --- a/arch/arm/mach-ixp23xx/include/mach/system.h +++ b/arch/arm/mach-ixp23xx/include/mach/system.h @@ -9,8 +9,5 @@ */ static inline void arch_idle(void) { -#if 0 - if (!hlt_counter) - cpu_do_idle(); -#endif + cpu_do_idle(); } |