diff options
author | Magnus Damm <damm@opensource.se> | 2013-11-19 19:02:31 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 03:24:27 -0500 |
commit | 3fbbcbdf57a5172318d10d0f16a4e2d2c595fd75 (patch) | |
tree | 62a1e033a919681895936c30171b6dbbca0ad078 /arch/arm | |
parent | 159a282dc3a1bcc9a0cc3a41304c41eef229add1 (diff) |
ARM: shmobile: Use ->init_late() on Lager
Hook in shmobile_init_late() on Lager V2. This enables some PM
related things like CPUIdle and Suspend-to-RAM.
With this patch applied it is possible to use Suspend-to-RAM:
# echo enabled > /sys/class/tty/ttySC6/power/wakeup
# echo mem > /sys/power/state
(wake by sending a character on the serial console)
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/board-lager-reference.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c index 7df9ea0839db..51a3bcc704e5 100644 --- a/arch/arm/mach-shmobile/board-lager-reference.c +++ b/arch/arm/mach-shmobile/board-lager-reference.c | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
23 | #include <mach/common.h> | ||
23 | #include <mach/rcar-gen2.h> | 24 | #include <mach/rcar-gen2.h> |
24 | #include <mach/r8a7790.h> | 25 | #include <mach/r8a7790.h> |
25 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
@@ -41,5 +42,6 @@ DT_MACHINE_START(LAGER_DT, "lager") | |||
41 | .init_early = r8a7790_init_early, | 42 | .init_early = r8a7790_init_early, |
42 | .init_time = rcar_gen2_timer_init, | 43 | .init_time = rcar_gen2_timer_init, |
43 | .init_machine = lager_add_standard_devices, | 44 | .init_machine = lager_add_standard_devices, |
45 | .init_late = shmobile_init_late, | ||
44 | .dt_compat = lager_boards_compat_dt, | 46 | .dt_compat = lager_boards_compat_dt, |
45 | MACHINE_END | 47 | MACHINE_END |
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index f5dab34c327e..d47052e3ceef 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c | |||
@@ -259,5 +259,6 @@ DT_MACHINE_START(LAGER_DT, "lager") | |||
259 | .init_early = r8a7790_init_early, | 259 | .init_early = r8a7790_init_early, |
260 | .init_time = rcar_gen2_timer_init, | 260 | .init_time = rcar_gen2_timer_init, |
261 | .init_machine = lager_init, | 261 | .init_machine = lager_init, |
262 | .init_late = shmobile_init_late, | ||
262 | .dt_compat = lager_boards_compat_dt, | 263 | .dt_compat = lager_boards_compat_dt, |
263 | MACHINE_END | 264 | MACHINE_END |