From: Magnus Damm Date: Wed, 20 Nov 2013 03:54:34 +0000 (+0900) Subject: ARM: shmobile: Use ->init_late() on Koelsch X-Git-Tag: firefly_0821_release~176^2~4587^2~5^2~11 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6dc00ab90fa8bc4fec2f9c206ee679d144bc7eb5;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Simon Horman --- 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 @@ #include #include #include +#include #include #include #include @@ -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 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 = { 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