ARM: tegra: Update tegra_lp0_suspend_init stubbing
Scott Williams [Thu, 21 Jul 2011 20:43:41 +0000 (13:43 -0700)]
Change-Id: I961125e938e72506dc304025b418e80387a5062e
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R393c5a77803f276467d2974041653eb92026601e

arch/arm/mach-tegra/pm.c
arch/arm/mach-tegra/pm.h

index 0239b24..7233229 100644 (file)
@@ -848,7 +848,7 @@ void __init tegra_init_suspend(struct tegra_suspend_platform_data *plat)
        pmc_32kwritel(reg, PMC_CTRL);
 
        if (pdata->suspend_mode == TEGRA_SUSPEND_LP0)
-               tegra2_lp0_suspend_init();
+               tegra_lp0_suspend_init();
 
        suspend_set_ops(&tegra_suspend_ops);
 
index 9617fcd..dc79322 100644 (file)
@@ -74,13 +74,6 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode);
 #define FUSE_SKU_DISABLE_ALL_CPUS      (1<<5)
 #define FUSE_SKU_NUM_DISABLED_CPUS(x)  (((x) >> 3) & 3)
 
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
-void tegra2_lp0_suspend_init(void);
-#else
-static inline void tegra2_lp0_suspend_init(void)
-{
-}
-#endif
 void __init tegra_init_suspend(struct tegra_suspend_platform_data *plat);
 
 unsigned int tegra_count_slow_cpus(unsigned long speed_limit);
@@ -124,7 +117,10 @@ static inline unsigned int is_lp_cluster(void)
 { return 0; }
 #define tegra_lp0_suspend_mc() do {} while(0)
 #define tegra_lp0_resume_mc() do {} while(0)
+void tegra2_lp0_suspend_init(void);
+
 #else
+
 #define INSTRUMENT_CLUSTER_SWITCH 1    /* Should be zero for shipping code */
 #define DEBUG_CLUSTER_SWITCH 1         /* Should be zero for shipping code */
 #define PARAMETERIZE_CLUSTER_SWITCH 1  /* Should be zero for shipping code */
@@ -148,6 +144,13 @@ void tegra_lp0_suspend_mc(void);
 void tegra_lp0_resume_mc(void);
 #endif
 
+static inline void tegra_lp0_suspend_init(void)
+{
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+       tegra2_lp0_suspend_init();
+#endif
+}
+
 #ifdef CONFIG_ARCH_TEGRA_2x_SOC
 void tegra2_lp2_set_trigger(unsigned long cycles);
 unsigned long tegra2_lp2_timer_remain(void);