git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-dss' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
z2.c
diff --git
a/arch/arm/mach-pxa/z2.c
b/arch/arm/mach-pxa/z2.c
index
6c9275a
..
ead32c9
100644
(file)
--- a/
arch/arm/mach-pxa/z2.c
+++ b/
arch/arm/mach-pxa/z2.c
@@
-686,7
+686,8
@@
static void z2_power_off(void)
*/
PSPR = 0x0;
local_irq_disable();
*/
PSPR = 0x0;
local_irq_disable();
- pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET);
+ pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP);
+ pxa27x_cpu_pm_enter(PM_SUSPEND_MEM);
}
#else
#define z2_power_off NULL
}
#else
#define z2_power_off NULL
@@
-718,7
+719,7
@@
static void __init z2_init(void)
}
MACHINE_START(ZIPIT2, "Zipit Z2")
}
MACHINE_START(ZIPIT2, "Zipit Z2")
- .
boot_params = 0xa0000
100,
+ .
atag_offset = 0x
100,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,