| From 19af200c043cb1bebcb6f74e2e69a6782dad844f Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Wed, 20 Nov 2013 09:02:31 +0900 |
| Subject: 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> |
| (cherry picked from commit 3fbbcbdf57a5172318d10d0f16a4e2d2c595fd75) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-lager-reference.c | 2 ++ |
| arch/arm/mach-shmobile/board-lager.c | 1 + |
| 2 files changed, 3 insertions(+) |
| |
| 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 @@ |
| |
| #include <linux/init.h> |
| #include <linux/of_platform.h> |
| +#include <mach/common.h> |
| #include <mach/rcar-gen2.h> |
| #include <mach/r8a7790.h> |
| #include <asm/mach/arch.h> |
| @@ -41,5 +42,6 @@ DT_MACHINE_START(LAGER_DT, "lager") |
| .init_early = r8a7790_init_early, |
| .init_time = rcar_gen2_timer_init, |
| .init_machine = lager_add_standard_devices, |
| + .init_late = shmobile_init_late, |
| .dt_compat = lager_boards_compat_dt, |
| MACHINE_END |
| diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c |
| index 7861a04ce14c..69dcf55383b7 100644 |
| --- a/arch/arm/mach-shmobile/board-lager.c |
| +++ b/arch/arm/mach-shmobile/board-lager.c |
| @@ -261,5 +261,6 @@ DT_MACHINE_START(LAGER_DT, "lager") |
| .init_early = r8a7790_init_early, |
| .init_time = rcar_gen2_timer_init, |
| .init_machine = lager_init, |
| + .init_late = shmobile_init_late, |
| .dt_compat = lager_boards_compat_dt, |
| MACHINE_END |
| -- |
| 1.8.5.rc3 |
| |
