---

yaml --- r: 256932 b: refs/heads/master c: 082517a h: refs/heads/master v: v3
git-mirror · Jul 2, 2011 · 7204835 · 7204835
1 parent e09cba7
commit 7204835
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33afebf3da2e8c26faebb1b271c810f937e35788
+refs/heads/master: 082517aa21c60c06bd2a4c287aab5e1b3d8c7c22
diff --git 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_a3rv;
+extern struct sh7372_pm_domain sh7372_a3ri;
 
 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
@@ -129,6 +129,10 @@ struct sh7372_pm_domain sh7372_a3rv = {
 	.bit_shift = 6,
 };
 
+struct sh7372_pm_domain sh7372_a3ri = {
+	.bit_shift = 8,
+};
+
 #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
@@ -843,6 +843,7 @@ void __init sh7372_add_standard_devices(void)
 {
 	sh7372_init_pm_domain(&sh7372_a4lc);
 	sh7372_init_pm_domain(&sh7372_a3rv);
+	sh7372_init_pm_domain(&sh7372_a3ri);
 
 	platform_add_devices(sh7372_early_devices,
 			    ARRAY_SIZE(sh7372_early_devices));