From fd7433cbb7a4a7767bcaf8c972dd1f202b0dea00 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Sun, 10 Jul 2011 10:38:22 +0200 Subject: [PATCH] --- yaml --- r: 256936 b: refs/heads/master c: d24771dec9c62945a5d1c6a37e7a04f5c2a2ae6f h: refs/heads/master 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 | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 858d2930ec1e..a2f97eb1b594 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1ba5bb5608664b37a3b1ac647e0dd67d46ddc99 +refs/heads/master: d24771dec9c62945a5d1c6a37e7a04f5c2a2ae6f diff --git a/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h b/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h index f3ceced6ebe9..ce595cee86cd 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/sh7372.h @@ -486,6 +486,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_a4mp; +extern struct sh7372_pm_domain sh7372_d4; extern struct sh7372_pm_domain sh7372_a3rv; extern struct sh7372_pm_domain sh7372_a3ri; extern struct sh7372_pm_domain sh7372_a3sg; diff --git a/trunk/arch/arm/mach-shmobile/pm-sh7372.c b/trunk/arch/arm/mach-shmobile/pm-sh7372.c index f3bd95f1a4a0..a8e0de1277dc 100644 --- a/trunk/arch/arm/mach-shmobile/pm-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/pm-sh7372.c @@ -129,6 +129,10 @@ struct sh7372_pm_domain sh7372_a4mp = { .bit_shift = 2, }; +struct sh7372_pm_domain sh7372_d4 = { + .bit_shift = 3, +}; + struct sh7372_pm_domain sh7372_a3rv = { .bit_shift = 6, }; diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7372.c b/trunk/arch/arm/mach-shmobile/setup-sh7372.c index 9b0cd436f8cd..79f0413d8725 100644 --- a/trunk/arch/arm/mach-shmobile/setup-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/setup-sh7372.c @@ -843,6 +843,7 @@ void __init sh7372_add_standard_devices(void) { sh7372_init_pm_domain(&sh7372_a4lc); sh7372_init_pm_domain(&sh7372_a4mp); + sh7372_init_pm_domain(&sh7372_d4); sh7372_init_pm_domain(&sh7372_a3rv); sh7372_init_pm_domain(&sh7372_a3ri); sh7372_init_pm_domain(&sh7372_a3sg);