diff options
| author | Magnus Damm <damm@opensource.se> | 2013-11-20 12:54:34 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 17:24:26 +0900 |
| commit | 6dc00ab90fa8bc4fec2f9c206ee679d144bc7eb5 (patch) | |
| tree | b4dfaf4438a99dd53bef12379cdeacc8e7f87720 /arch/arm/mach-shmobile | |
| parent | e0554d90b076da1c543b42599c1d6636286ca47f (diff) | |
| download | op-kernel-dev-6dc00ab90fa8bc4fec2f9c206ee679d144bc7eb5.zip op-kernel-dev-6dc00ab90fa8bc4fec2f9c206ee679d144bc7eb5.tar.gz | |
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.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-koelsch.c | 3 |
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 25b558f..a804a17 100644 --- a/arch/arm/mach-shmobile/board-koelsch-reference.c +++ b/arch/arm/mach-shmobile/board-koelsch-reference.c @@ -22,6 +22,7 @@ #include <linux/clk-provider.h> #include <linux/kernel.h> #include <linux/of_platform.h> +#include <mach/common.h> #include <mach/rcar-gen2.h> #include <mach/r8a7791.h> #include <asm/mach/arch.h> @@ -47,5 +48,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch") .init_early = r8a7791_init_early, .init_time = rcar_gen2_timer_init, .init_machine = koelsch_add_standard_devices, + .init_late = shmobile_init_late, .dt_compat = koelsch_boards_compat_dt, MACHINE_END diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c index 5b81a34..135929b 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 = { DT_MACHINE_START(KOELSCH_DT, "koelsch") .smp = smp_ops(r8a7791_smp_ops), .init_early = r8a7791_init_early, - .init_machine = koelsch_add_standard_devices, .init_time = rcar_gen2_timer_init, + .init_machine = koelsch_add_standard_devices, + .init_late = shmobile_init_late, .dt_compat = koelsch_boards_compat_dt, MACHINE_END |
