ARM: tegra11x: timer save/restore is removed
[linux-2.6.git] / arch / arm / mach-tegra / pm.c
index 3e3dfc7..267a30c 100644 (file)
@@ -103,9 +103,6 @@ struct suspend_context {
        u8 uart[5];
 
        struct tegra_twd_context twd;
-#ifdef CONFIG_ARM_ARCH_TIMER
-       struct arch_timer_context arch_timer;
-#endif
 };
 
 #ifdef CONFIG_PM_SLEEP
@@ -429,19 +426,11 @@ static void restore_cpu_complex(u32 mode)
           idle or system suspend, the local timer was shut down and
           timekeeping switched over to the global system timer. In this
           case keep local timer disabled, and restore only periodic load. */
+#ifdef CONFIG_HAVE_ARM_TWD
        if (!(mode & (TEGRA_POWER_CLUSTER_MASK |
                      TEGRA_POWER_CLUSTER_IMMEDIATE))) {
-#ifdef CONFIG_ARM_ARCH_TIMER
-               tegra_sctx.arch_timer.cntp_ctl = 0;
-#endif
-#ifdef CONFIG_HAVE_ARM_TWD
                tegra_sctx.twd.twd_ctrl = 0;
-#endif
        }
-#ifdef CONFIG_ARM_ARCH_TIMER
-       arch_timer_resume(&tegra_sctx.arch_timer);
-#endif
-#ifdef CONFIG_HAVE_ARM_TWD
        tegra_twd_resume(&tegra_sctx.twd);
 #endif
 }
@@ -478,9 +467,6 @@ static void suspend_cpu_complex(u32 mode)
 #ifdef CONFIG_HAVE_ARM_TWD
        tegra_twd_suspend(&tegra_sctx.twd);
 #endif
-#ifdef CONFIG_ARM_ARCH_TIMER
-       arch_timer_suspend(&tegra_sctx.arch_timer);
-#endif
 
        reg = readl(FLOW_CTRL_CPU_CSR(cpu));
        reg &= ~FLOW_CTRL_CSR_WFE_BITMAP;       /* clear wfe bitmap */