1 files changed, 33 insertions, 24 deletions

diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index c1f698f2b469..5bcde8a79c53 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -999,8 +999,17 @@ static struct platform_device *sh7372_late_devices[] __initdata = {
         &spu1_device,
 };
 
+#define DEV_LATENCY_NS  250000
+
 void __init sh7372_add_standard_devices(void)
 {
+        struct gpd_timing_data latencies = {
+                .stop_latency_ns = DEV_LATENCY_NS,
+                .start_latency_ns = DEV_LATENCY_NS,
+                .save_state_latency_ns = DEV_LATENCY_NS,
+                .restore_state_latency_ns = DEV_LATENCY_NS,
+        };
+
         sh7372_init_pm_domains();
 
         platform_add_devices(sh7372_early_devices,
@@ -1009,30 +1018,30 @@ void __init sh7372_add_standard_devices(void)
         platform_add_devices(sh7372_late_devices,
                             ARRAY_SIZE(sh7372_late_devices));
 
-        rmobile_add_device_to_domain("A3RV", &vpu_device);
-        rmobile_add_device_to_domain("A4MP", &spu0_device);
-        rmobile_add_device_to_domain("A4MP", &spu1_device);
-        rmobile_add_device_to_domain("A3SP", &scif0_device);
-        rmobile_add_device_to_domain("A3SP", &scif1_device);
-        rmobile_add_device_to_domain("A3SP", &scif2_device);
-        rmobile_add_device_to_domain("A3SP", &scif3_device);
-        rmobile_add_device_to_domain("A3SP", &scif4_device);
-        rmobile_add_device_to_domain("A3SP", &scif5_device);
-        rmobile_add_device_to_domain("A3SP", &scif6_device);
-        rmobile_add_device_to_domain("A3SP", &iic1_device);
-        rmobile_add_device_to_domain("A3SP", &dma0_device);
-        rmobile_add_device_to_domain("A3SP", &dma1_device);
-        rmobile_add_device_to_domain("A3SP", &dma2_device);
-        rmobile_add_device_to_domain("A3SP", &usb_dma0_device);
-        rmobile_add_device_to_domain("A3SP", &usb_dma1_device);
-        rmobile_add_device_to_domain("A4R", &iic0_device);
-        rmobile_add_device_to_domain("A4R", &veu0_device);
-        rmobile_add_device_to_domain("A4R", &veu1_device);
-        rmobile_add_device_to_domain("A4R", &veu2_device);
-        rmobile_add_device_to_domain("A4R", &veu3_device);
-        rmobile_add_device_to_domain("A4R", &jpu_device);
-        rmobile_add_device_to_domain("A4R", &tmu00_device);
-        rmobile_add_device_to_domain("A4R", &tmu01_device);
+        rmobile_add_device_to_domain_td("A3RV", &vpu_device, &latencies);
+        rmobile_add_device_to_domain_td("A4MP", &spu0_device, &latencies);
+        rmobile_add_device_to_domain_td("A4MP", &spu1_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &scif0_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &scif1_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &scif2_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &scif3_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &scif4_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &scif5_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &scif6_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &iic1_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &dma0_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &dma1_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &dma2_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &usb_dma0_device, &latencies);
+        rmobile_add_device_to_domain_td("A3SP", &usb_dma1_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &iic0_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &veu0_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &veu1_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &veu2_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &veu3_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &jpu_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &tmu00_device, &latencies);
+        rmobile_add_device_to_domain_td("A4R", &tmu01_device, &latencies);
 }
 
 static void __init sh7372_earlytimer_init(void)