diff options
| author | Joseph Lo <josephl@nvidia.com> | 2013-10-11 17:57:32 +0800 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-10-18 16:28:09 -0600 |
| commit | 24036fdc76f94da594bf7759be46a185726072ea (patch) | |
| tree | e5914920e53b0a49467ce62c09ff3e678b31d85c | |
| parent | d127e9c5c5bc1ee22a7b1fe804397cddd132f756 (diff) | |
| download | blackbird-op-linux-24036fdc76f94da594bf7759be46a185726072ea.tar.gz blackbird-op-linux-24036fdc76f94da594bf7759be46a185726072ea.zip | |
ARM: tegra: enable CPU idle for Tegra124
The CPUIdle function of Tegra124 is identical to Tegra114, so we share
the same driver with Tegra114.
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 04ca2b3f34c1..de3748ed0b42 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -36,5 +36,8 @@ ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o endif obj-$(CONFIG_ARCH_TEGRA_124_SOC) += sleep-tegra30.o +ifeq ($(CONFIG_CPU_IDLE),y) +obj-$(CONFIG_ARCH_TEGRA_124_SOC) += cpuidle-tegra114.o +endif obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-paz00.o diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c index 0961dfcf83a4..7bc5d8d667fe 100644 --- a/arch/arm/mach-tegra/cpuidle.c +++ b/arch/arm/mach-tegra/cpuidle.c @@ -39,7 +39,9 @@ void __init tegra_cpuidle_init(void) tegra30_cpuidle_init(); break; case TEGRA114: - if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC)) + case TEGRA124: + if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) || + IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC)) tegra114_cpuidle_init(); break; } |
