summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorMagnus Damm2013-11-20 01:02:31 +0100
committerSimon Horman2013-12-10 09:24:27 +0100
commit3fbbcbdf57a5172318d10d0f16a4e2d2c595fd75 (patch)
tree62a1e033a919681895936c30171b6dbbca0ad078 /arch/arm/mach-shmobile
parentARM: shmobile: Hook up SW30-SW36 on Koelsch (diff)
downloadkernel-qcow2-linux-3fbbcbdf57a5172318d10d0f16a4e2d2c595fd75.tar.gz
kernel-qcow2-linux-3fbbcbdf57a5172318d10d0f16a4e2d2c595fd75.tar.xz
kernel-qcow2-linux-3fbbcbdf57a5172318d10d0f16a4e2d2c595fd75.zip
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/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-lager-reference.c2
-rw-r--r--arch/arm/mach-shmobile/board-lager.c1
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 @@
#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 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")
.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