diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-08-19 21:36:06 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-08-30 19:34:40 -0700 |
| commit | 0c51bbe83660c167799e171da59628373a46365e (patch) | |
| tree | a6861af052dc2f9215b604b4c0d09d69707d13ca /arch/arm/mach-tegra/cpuidle-tegra20.c | |
| parent | 55e58d8296ddb5edf84e8b444e4d43e5c9845956 (diff) | |
Revert "ARM: tegra: cpuidle: use init/exit common routine for tegra2"
This reverts commit c5106c9dea9a6022ab84c6cb1d4a0b19fc5af0e2.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/cpuidle-tegra20.c')
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra20.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c index 0cdba8de8c77..6230431f4c48 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c @@ -70,6 +70,8 @@ static struct cpuidle_driver tegra_idle_driver = { .safe_state_index = 0, }; +static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device); + #ifdef CONFIG_PM_SLEEP #ifdef CONFIG_SMP static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); @@ -214,8 +216,34 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, int __init tegra20_cpuidle_init(void) { + int ret; + unsigned int cpu; + struct cpuidle_device *dev; + struct cpuidle_driver *drv = &tegra_idle_driver; + #ifdef CONFIG_PM_SLEEP tegra_tear_down_cpu = tegra20_tear_down_cpu; #endif - return cpuidle_register(&tegra_idle_driver, cpu_possible_mask); + + ret = cpuidle_register_driver(&tegra_idle_driver); + if (ret) { + pr_err("CPUidle driver registration failed\n"); + return ret; + } + + for_each_possible_cpu(cpu) { + dev = &per_cpu(tegra_idle_device, cpu); + dev->cpu = cpu; +#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED + dev->coupled_cpus = *cpu_possible_mask; +#endif + + ret = cpuidle_register_device(dev); + if (ret) { + pr_err("CPU%u: CPUidle device registration failed\n", + cpu); + return ret; + } + } + return 0; } |