ARM: mach-shmobile: sh7372 A3RV support

Add support for the sh7372 A3RV power domain and hook
up the VPU device.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index 495013c75c6b482ce2563c27929a967ad0353898..e935b5e2e5d0732fba159789b656d0c013498fbf 100644 (file)
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/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/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index e17f12424ec78dd29852eff49811ba9c18c96f8c..d467c8668d795380117b968476796b15a3127ddf 100644 (file)
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/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/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index ec1ae8cc9caa488cbe7da1a2c2afb2b456fb94e7..14a497fedba0bcab421e7d359055a0d2aff145ec 100644 (file)
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/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)