From e09cba77462307259803a1cf5b37ff396a456e8e Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Fri, 1 Jul 2011 22:14:45 +0200 Subject: [PATCH] --- yaml --- r: 256931 b: refs/heads/master c: 33afebf3da2e8c26faebb1b271c810f937e35788 h: refs/heads/master i: 256929: 6e299656c637a685c8fb56bcad310cae5516930a 256927: d2ff02d10ca54274daa29c4c7d181b770528c05a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/include/mach/sh7372.h | 1 + trunk/arch/arm/mach-shmobile/pm-sh7372.c | 4 ++++ trunk/arch/arm/mach-shmobile/setup-sh7372.c | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9d2eaa8b9a45..997083e1ecdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96f7934e448fd52644b8862ea12761e1524f3bf3 +refs/heads/master: 33afebf3da2e8c26faebb1b271c810f937e35788 diff --git a/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h b/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h index 495013c75c6b..e935b5e2e5d0 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h @@ -485,6 +485,7 @@ static inline struct sh7372_pm_domain *to_sh7372_pd(struct generic_pm_domain *d) #ifdef CONFIG_PM extern struct sh7372_pm_domain sh7372_a4lc; +extern struct sh7372_pm_domain sh7372_a3rv; extern void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd); extern void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd, diff --git a/trunk/arch/arm/mach-shmobile/pm-sh7372.c b/trunk/arch/arm/mach-shmobile/pm-sh7372.c index e17f12424ec7..d467c8668d79 100644 --- a/trunk/arch/arm/mach-shmobile/pm-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/pm-sh7372.c @@ -125,6 +125,10 @@ struct sh7372_pm_domain sh7372_a4lc = { .bit_shift = 1, }; +struct sh7372_pm_domain sh7372_a3rv = { + .bit_shift = 6, +}; + #endif /* CONFIG_PM */ static void sh7372_enter_core_standby(void) diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7372.c b/trunk/arch/arm/mach-shmobile/setup-sh7372.c index ec1ae8cc9caa..14a497fedba0 100644 --- a/trunk/arch/arm/mach-shmobile/setup-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/setup-sh7372.c @@ -842,12 +842,15 @@ static struct platform_device *sh7372_late_devices[] __initdata = { void __init sh7372_add_standard_devices(void) { sh7372_init_pm_domain(&sh7372_a4lc); + sh7372_init_pm_domain(&sh7372_a3rv); platform_add_devices(sh7372_early_devices, ARRAY_SIZE(sh7372_early_devices)); platform_add_devices(sh7372_late_devices, ARRAY_SIZE(sh7372_late_devices)); + + sh7372_add_device_to_domain(&sh7372_a3rv, &vpu_device); } void __init sh7372_add_early_devices(void)