aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-11-19 22:54:34 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 03:24:26 -0500
commit6dc00ab90fa8bc4fec2f9c206ee679d144bc7eb5 (patch)
treeb4dfaf4438a99dd53bef12379cdeacc8e7f87720 /arch/arm/mach-shmobile
parente0554d90b076da1c543b42599c1d6636286ca47f (diff)
ARM: shmobile: Use ->init_late() on Koelsch
Hook in shmobile_init_late() on Koelsch. 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-koelsch-reference.c2
-rw-r--r--arch/arm/mach-shmobile/board-koelsch.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 25b558f462a3..a804a1798a71 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -22,6 +22,7 @@
22#include <linux/clk-provider.h> 22#include <linux/clk-provider.h>
23#include <linux/kernel.h> 23#include <linux/kernel.h>
24#include <linux/of_platform.h> 24#include <linux/of_platform.h>
25#include <mach/common.h>
25#include <mach/rcar-gen2.h> 26#include <mach/rcar-gen2.h>
26#include <mach/r8a7791.h> 27#include <mach/r8a7791.h>
27#include <asm/mach/arch.h> 28#include <asm/mach/arch.h>
@@ -47,5 +48,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
47 .init_early = r8a7791_init_early, 48 .init_early = r8a7791_init_early,
48 .init_time = rcar_gen2_timer_init, 49 .init_time = rcar_gen2_timer_init,
49 .init_machine = koelsch_add_standard_devices, 50 .init_machine = koelsch_add_standard_devices,
51 .init_late = shmobile_init_late,
50 .dt_compat = koelsch_boards_compat_dt, 52 .dt_compat = koelsch_boards_compat_dt,
51MACHINE_END 53MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index 5b81a343c5f9..135929b15650 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -92,7 +92,8 @@ static const char * const koelsch_boards_compat_dt[] __initconst = {
92DT_MACHINE_START(KOELSCH_DT, "koelsch") 92DT_MACHINE_START(KOELSCH_DT, "koelsch")
93 .smp = smp_ops(r8a7791_smp_ops), 93 .smp = smp_ops(r8a7791_smp_ops),
94 .init_early = r8a7791_init_early, 94 .init_early = r8a7791_init_early,
95 .init_machine = koelsch_add_standard_devices,
96 .init_time = rcar_gen2_timer_init, 95 .init_time = rcar_gen2_timer_init,
96 .init_machine = koelsch_add_standard_devices,
97 .init_late = shmobile_init_late,
97 .dt_compat = koelsch_boards_compat_dt, 98 .dt_compat = koelsch_boards_compat_dt,
98MACHINE_END 99MACHINE_END