ARM: tegra: cpuidle: move the init function behind the suspend init function

One of the state of CPUidle on Tegra can power gate the CPU and the
vdd_cpu rail. But it depends on some configurations from DT and a common
hook function for different Tegra SoCs to power gate the CPU rail. And
these stuffs are initialized after common Tegra suspend init function. So
we move the CPUidle init behind the suspend init function. And making the
CPUidle driver more generic.

Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 9f852c6fe5b97360fb9a557c00fb734273802951..ec5836b1e7133d75118f082710337505bc800dcc 100644 (file)
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -29,6 +29,7 @@
 
 #include "board.h"
 #include "common.h"
+#include "cpuidle.h"
 #include "fuse.h"
 #include "iomap.h"
 #include "irq.h"
@@ -108,5 +109,6 @@ void __init tegra_init_early(void)
 void __init tegra_init_late(void)
 {
        tegra_init_suspend();
+       tegra_cpuidle_init();
        tegra_powergate_debugfs_init();
 }

diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c
index 4b744c4661e20d2cb4f809235e7e629143c7901a..4a7a78804118f2d17fb638be5e9e4ba567b95b8c 100644 (file)
--- a/arch/arm/mach-tegra/cpuidle.c
+++ b/arch/arm/mach-tegra/cpuidle.c
@@ -27,25 +27,19 @@
 #include "fuse.h"
 #include "cpuidle.h"
 
-static int __init tegra_cpuidle_init(void)
+void __init tegra_cpuidle_init(void)
 {
-       int ret;
-
        switch (tegra_chip_id) {
        case TEGRA20:
-               ret = tegra20_cpuidle_init();
+               tegra20_cpuidle_init();
                break;
        case TEGRA30:
-               ret = tegra30_cpuidle_init();
+               tegra30_cpuidle_init();
                break;
        case TEGRA114:
-               ret = tegra114_cpuidle_init();
+               tegra114_cpuidle_init();
                break;
        default:
-               ret = -ENODEV;
                break;
        }
-
-       return ret;
 }
-device_initcall(tegra_cpuidle_init);

diff --git a/arch/arm/mach-tegra/cpuidle.h b/arch/arm/mach-tegra/cpuidle.h
index d733f75d02082e83950911765489fa6909103c56..9bcf61fa38b804153614c627b20d7c425c94800d 100644 (file)
--- a/arch/arm/mach-tegra/cpuidle.h
+++ b/arch/arm/mach-tegra/cpuidle.h
@@ -35,4 +35,10 @@ int tegra114_cpuidle_init(void);
 static inline int tegra114_cpuidle_init(void) { return -ENODEV; }
 #endif
 
+#ifdef CONFIG_CPU_IDLE
+void tegra_cpuidle_init(void);
+#else
+static inline void tegra_cpuidle_init(void) {}
+#endif
+
 #endif