get tegra3 compiling
Dan Willemsen [Mon, 13 Jun 2011 20:32:48 +0000 (13:32 -0700)]
Rebase-Id: R03f1fc69f4859a0dc66fbd145eb0df31650de3ac

arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/pm-t3.c
arch/arm/mach-tegra/pm.c
arch/arm/mach-tegra/pm.h
arch/arm/mach-tegra/sysfs-cluster.c

index ca7c397..13c4044 100644 (file)
@@ -54,6 +54,7 @@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += cpu-tegra3.o
 endif
 obj-$(CONFIG_TEGRA_PCI)                        += pcie.o
 obj-$(CONFIG_DEBUG_ICEDCC)              += sysfs-dcc.o
+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += sysfs-cluster.o
 
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)                += board-dt-tegra20.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)                += board-dt-tegra30.o
index 89f7990..c171b9d 100644 (file)
@@ -86,7 +86,6 @@
 #define CPU_CLOCK(cpu) (0x1<<(8+cpu))
 #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)
 {
@@ -305,7 +304,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)
index 140926e..5f2423f 100644 (file)
@@ -712,8 +712,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()) {
index dfa0bbb..095a3eb 100644 (file)
@@ -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 */
index 98c42e2..bf99e87 100644 (file)
@@ -87,7 +87,7 @@
 #include <linux/clk.h>
 
 #include "iomap.h"
-#include "power.h"
+#include "pm.h"
 #include "clock.h"
 
 #define SYSFS_CLUSTER_PRINTS      1    /* Nonzero: enable status prints */