get tegra3 compiling

Rebase-Id: R03f1fc69f4859a0dc66fbd145eb0df31650de3ac

5 files changed, 9 insertions, 5 deletions

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 8aed9ed2e033..5ed0b7ff2d12 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -64,6 +64,7 @@ obj-$(CONFIG_TEGRA_IOVMM)               += iovmm.o
 obj-$(CONFIG_TEGRA_IOVMM_GART)          += iovmm-gart.o
 obj-$(CONFIG_TEGRA_IOVMM_SMMU)          += iovmm-smmu.o
 obj-$(CONFIG_DEBUG_ICEDCC)              += sysfs-dcc.o
+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= sysfs-cluster.o
 ifeq ($(CONFIG_TEGRA_MC_PROFILE),y)
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_mc.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra3_mc_stats.o
diff --git a/arch/arm/mach-tegra/pm-t3.c b/arch/arm/mach-tegra/pm-t3.c
index f67e4dc9b43f..63b3eb0d38a2 100644
--- a/arch/arm/mach-tegra/pm-t3.c
+++ b/arch/arm/mach-tegra/pm-t3.c
@@ -86,8 +86,6 @@
 #define CPU_RESET(cpu)	(0x1111ul<<(cpu))
 
 
-void tegra_suspend_dram(bool lp0_ok, unsigned int flags);
-
 static int cluster_switch_prolog_clock(unsigned int flags)
 {
 	u32 reg;
@@ -305,7 +303,7 @@ int tegra_cluster_control(unsigned int us, unsigned int flags)
 			tegra_lp2_set_trigger(us);
 #endif
 
-		tegra_suspend_dram(false, flags);
+		tegra_suspend_dram(TEGRA_SUSPEND_LP1);
 
 #if 0 /* FIXME! */
 		if (us)
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index dbb5d9439962..e2da73c03fd3 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -724,8 +724,11 @@ static const char *lp_state[TEGRA_MAX_SUSPEND_MODE] = {
 
 static int tegra_suspend_enter(suspend_state_t state)
 {
-	enum tegra_suspend_mode mode = current_suspend_mode;
+	return tegra_suspend_dram(current_suspend_mode);
+}
 
+int tegra_suspend_dram(enum tegra_suspend_mode mode)
+{
 	BUG_ON(mode < 0 || mode >= TEGRA_MAX_SUSPEND_MODE);
 
 	if ((mode == TEGRA_SUSPEND_LP0) && !tegra_pm_irq_lp0_allowed()) {
diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h
index 7d7e2a87445f..b90fc87e381b 100644
--- a/arch/arm/mach-tegra/pm.h
+++ b/arch/arm/mach-tegra/pm.h
@@ -47,6 +47,8 @@ unsigned long tegra_cpu_power_good_time(void);
 unsigned long tegra_cpu_power_off_time(void);
 unsigned long tegra_cpu_lp2_min_residency(void);
 
+int tegra_suspend_dram(enum tegra_suspend_mode mode);
+
 #define TEGRA_POWER_SDRAM_SELFREFRESH	0x400	/* SDRAM is in self-refresh */
 
 #define TEGRA_POWER_CLUSTER_G		0x1000	/* G CPU */
diff --git a/arch/arm/mach-tegra/sysfs-cluster.c b/arch/arm/mach-tegra/sysfs-cluster.c
index 4fcaffd9ff3d..a642bcdfb9f8 100644
--- a/arch/arm/mach-tegra/sysfs-cluster.c
+++ b/arch/arm/mach-tegra/sysfs-cluster.c
@@ -87,7 +87,7 @@
 #include <linux/clk.h>
 
 #include <mach/iomap.h>
-#include "power.h"
+#include "pm.h"
 #include "clock.h"
 
 #define SYSFS_CLUSTER_PRINTS	   1	/* Nonzero: enable status prints */