diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-03 18:21:16 +0200 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-21 00:55:19 +0100 |
| commit | daa14d5e60e040bde290ec904af976fef6292627 (patch) | |
| tree | d88b1dea6ee63cfc9896ea19ddc23299a35e409e /arch | |
| parent | ARM: mach-s3c64xx: use standard arch_idle() implementation (diff) | |
| download | linux-daa14d5e60e040bde290ec904af976fef6292627.tar.xz linux-daa14d5e60e040bde290ec904af976fef6292627.zip | |
ARM: mach-tegra: properly disable CPU idle call
Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/system.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index a2eb90169aed..2db20da1d585 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -27,7 +27,6 @@ #include <asm/hardware/gic.h> #include <mach/iomap.h> -#include <mach/system.h> #include "board.h" #include "clock.h" @@ -96,6 +95,8 @@ static void __init tegra_init_cache(u32 tag_latency, u32 data_latency) #ifdef CONFIG_ARCH_TEGRA_2x_SOC void __init tegra20_init_early(void) { + disable_hlt(); /* idle WFI usage needs to be confirmed */ + tegra_init_fuse(); tegra2_init_clocks(); tegra_clk_init_from_table(tegra20_clk_init_table); diff --git a/arch/arm/mach-tegra/include/mach/system.h b/arch/arm/mach-tegra/include/mach/system.h index a312988bf6f8..968ea2b0529b 100644 --- a/arch/arm/mach-tegra/include/mach/system.h +++ b/arch/arm/mach-tegra/include/mach/system.h @@ -23,6 +23,7 @@ static inline void arch_idle(void) { + cpu_do_idle(); } #endif |