diff options
author | Mike Rapoport <mike@compulab.co.il> | 2009-05-26 02:41:46 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-04 22:50:25 -0400 |
commit | 9599d1dbc2264355ecad0bae76bf6c1236c84c73 (patch) | |
tree | c0b5c9ca44511105dbdf76b54605dca8009cd5fd /arch | |
parent | 128d88b82e47d070170c256b2b19f57c352af310 (diff) |
[ARM] pxa/em-x270, cm-x270: use DEEPSLEEP for PM_SUSPEND_MEM
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 34576ba5f5fd..1d2cec25391d 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
@@ -335,6 +335,10 @@ void __init cmx270_init(void) | |||
335 | { | 335 | { |
336 | pxa2xx_mfp_config(ARRAY_AND_SIZE(cmx270_pin_config)); | 336 | pxa2xx_mfp_config(ARRAY_AND_SIZE(cmx270_pin_config)); |
337 | 337 | ||
338 | #ifdef CONFIG_PM | ||
339 | pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP); | ||
340 | #endif | ||
341 | |||
338 | cmx270_init_rtc(); | 342 | cmx270_init_rtc(); |
339 | cmx270_init_mmc(); | 343 | cmx270_init_mmc(); |
340 | cmx270_init_ohci(); | 344 | cmx270_init_ohci(); |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 3ff1fec017fd..243e0802b5f4 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -1215,6 +1215,10 @@ static void __init em_x270_init(void) | |||
1215 | { | 1215 | { |
1216 | pxa2xx_mfp_config(ARRAY_AND_SIZE(common_pin_config)); | 1216 | pxa2xx_mfp_config(ARRAY_AND_SIZE(common_pin_config)); |
1217 | 1217 | ||
1218 | #ifdef CONFIG_PM | ||
1219 | pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP); | ||
1220 | #endif | ||
1221 | |||
1218 | if (machine_is_em_x270()) | 1222 | if (machine_is_em_x270()) |
1219 | em_x270_module_init(); | 1223 | em_x270_module_init(); |
1220 | else if (machine_is_exeda()) | 1224 | else if (machine_is_exeda()) |