From 0f65ec42314c5376669464d5c9acfd34626c0066 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Sun, 10 Jul 2011 10:38:34 +0200 Subject: [PATCH] --- yaml --- r: 256937 b: refs/heads/master c: 999a4d2a4da0527567e4b17d4da0782509358a83 h: refs/heads/master i: 256935: 65d33f4589a8e45a9f306012b1e130c9f4a695e6 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/include/mach/common.h | 1 + trunk/arch/arm/mach-shmobile/pm_runtime.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a2f97eb1b594..96b8cddc0f73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d24771dec9c62945a5d1c6a37e7a04f5c2a2ae6f +refs/heads/master: 999a4d2a4da0527567e4b17d4da0782509358a83 diff --git a/trunk/arch/arm/mach-shmobile/include/mach/common.h b/trunk/arch/arm/mach-shmobile/include/mach/common.h index 06aecb31d9c7..73a76d75ccbc 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/common.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/common.h @@ -12,6 +12,7 @@ extern struct platform_suspend_ops shmobile_suspend_ops; struct cpuidle_device; extern void (*shmobile_cpuidle_modes[])(void); extern void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev); +extern void (*shmobile_runtime_pm_late_init)(void); extern void sh7367_init_irq(void); extern void sh7367_add_early_devices(void); diff --git a/trunk/arch/arm/mach-shmobile/pm_runtime.c b/trunk/arch/arm/mach-shmobile/pm_runtime.c index 2bcde1c46a6b..2f6ded5712ee 100644 --- a/trunk/arch/arm/mach-shmobile/pm_runtime.c +++ b/trunk/arch/arm/mach-shmobile/pm_runtime.c @@ -56,3 +56,13 @@ static int __init sh_pm_runtime_init(void) return 0; } core_initcall(sh_pm_runtime_init); + +void (*shmobile_runtime_pm_late_init)(void); + +static int __init sh_pm_runtime_late_init(void) +{ + if (shmobile_runtime_pm_late_init) + shmobile_runtime_pm_late_init(); + return 0; +} +late_initcall(sh_pm_runtime_late_init);