summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/arch/arm')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Makefile10
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c10
2 files changed, 7 insertions, 13 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Makefile b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Makefile
index bd08be1127..79c0a68a29 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Makefile
@@ -5,6 +5,13 @@
obj-y := spc300.o spc300-devices.o spc300-device-wdt.o spc300-device-gpio.o \
spc300-reset_cause.o
+# Power Management
+ifeq ($(CONFIG_PM), y)
+ifeq ($(CONFIG_CHIP_FEATURE_SRAM), y)
+obj-y += spc300-pm.o
+endif
+endif
+
obj-$(CONFIG_MACH_ARIZONA) += board-arizona.o
obj-$(CONFIG_MACH_SPK300G) += board-spk300g.o
obj-$(CONFIG_MACH_SPK300) += board-spk300.o
@@ -18,6 +25,3 @@ obj-$(CONFIG_MACH_MCR500) += board-mse500.o
obj-$(CONFIG_MACH_MPR520) += board-mse500.o
obj-$(CONFIG_CHIP_FEATURE_SRAM) += sram.o
-
-# Power Management
-obj-$(CONFIG_PM) += spc300-pm.o
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c
index 42b32a92b8..97e909492e 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-pm.c
@@ -22,16 +22,13 @@
#include <linux/interrupt.h>
#include <linux/proc_fs.h>
#include <linux/time.h>
-#ifdef CONFIG_CHIP_FEATURE_SRAM
#include <asm/arch/ips/sram.h>
#include <asm/io.h>
-#endif
#include <asm/arch/wdt.h>
#include <asm/arch/spc300-pm.h>
#include "spc300.h"
-#ifdef CONFIG_CHIP_FEATURE_SRAM
/* SRAM shared data. */
sram_data_t sram_data;
@@ -80,7 +77,6 @@ void system_time_update ()
do_settimeofday(&ts);
sram_data.tick_counter = 0;
}
-#endif
static bool spc300_pm_suspend_cmd;
@@ -98,17 +94,14 @@ static int spc300_pm_enter(suspend_state_t state)
{
BUG_ON(state != PM_SUSPEND_MEM);
-#ifdef CONFIG_CHIP_FEATURE_SRAM
/* Map the required registers. */
map_extra_registers();
/* Copy data structure in SRAM. */
memcpy ((void *)SRAM_DATA_BASE_VA_PTR, &sram_data, sizeof(sram_data));
-#endif
spc300_irq_suspend();
local_irq_disable();
spc300_wdt_set_irq_mode();
-#ifdef CONFIG_CHIP_FEATURE_SRAM
pm_process();
/* Copy data structure from SRAM. */
memcpy (&sram_data, (void *)SRAM_DATA_BASE_VA_PTR, sizeof(sram_data));
@@ -117,7 +110,6 @@ static int spc300_pm_enter(suspend_state_t state)
unmap_extra_registers();
/* Update system time. */
system_time_update();
-#endif
/* Clear suspend request command */
spc300_pm_suspend_cmd = false;
spc300_wdt_unset_irq_mode();
@@ -168,10 +160,8 @@ static int __init spc300_pm_init(void)
/* Initialize PM standby command. */
spc300_pm_suspend_cmd = false;
-#ifdef CONFIG_CHIP_FEATURE_SRAM
/* Link SRAM part of the suspend process. */
pm_process = (void *) SRAM_BASE_VA_PTR;
-#endif
suspend_set_ops(&spc300_pm_ops);