2 files changed, 37 insertions, 8 deletions

diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/plat-omap/include/plat/omap_device.h
index dc1fac1d805c..76d49171fed9 100644
--- a/arch/arm/plat-omap/include/plat/omap_device.h
+++ b/arch/arm/plat-omap/include/plat/omap_device.h
@@ -131,11 +131,15 @@ int omap_device_enable_clocks(struct omap_device *od);
  */
 struct omap_device_pm_latency {
         u32 deactivate_lat;
+        u32 deactivate_lat_worst;
         int (*deactivate_func)(struct omap_device *od);
         u32 activate_lat;
+        u32 activate_lat_worst;
         int (*activate_func)(struct omap_device *od);
+        u32 flags;
 };
 
+#define OMAP_DEVICE_LATENCY_AUTO_ADJUST BIT(1)
 
 /* Get omap_device pointer from platform_device pointer */
 #define to_omap_device(x) container_of((x), struct omap_device, pdev)
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index 1e5648d3e3d8..d8c75c8f78d7 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -148,10 +148,22 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat)
                          "%llu nsec\n", od->pdev.name, od->pm_lat_level,
                          act_lat);
 
-                WARN(act_lat > odpl->activate_lat, "omap_device: %s.%d: "
-                     "activate step %d took longer than expected (%llu > %d)\n",
-                     od->pdev.name, od->pdev.id, od->pm_lat_level,
-                     act_lat, odpl->activate_lat);
+                if (act_lat > odpl->activate_lat) {
+                        odpl->activate_lat_worst = act_lat;
+                        if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) {
+                                odpl->activate_lat = act_lat;
+                                pr_warning("omap_device: %s.%d: new worst case "
+                                           "activate latency %d: %llu\n",
+                                           od->pdev.name, od->pdev.id,
+                                           od->pm_lat_level, act_lat);
+                        } else
+                                pr_warning("omap_device: %s.%d: activate "
+                                           "latency %d higher than exptected. "
+                                           "(%llu > %d)\n",
+                                           od->pdev.name, od->pdev.id,
+                                           od->pm_lat_level, act_lat,
+                                           odpl->activate_lat);
+                }
 
                 od->dev_wakeup_lat -= odpl->activate_lat;
         }
@@ -204,10 +216,23 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)
                          "%llu nsec\n", od->pdev.name, od->pm_lat_level,
                          deact_lat);
 
-                WARN(deact_lat > odpl->deactivate_lat, "omap_device: %s.%d: "
-                     "deactivate step %d took longer than expected "
-                     "(%llu > %d)\n", od->pdev.name, od->pdev.id,
-                     od->pm_lat_level, deact_lat, odpl->deactivate_lat);
+                if (deact_lat > odpl->deactivate_lat) {
+                        odpl->deactivate_lat_worst = deact_lat;
+                        if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) {
+                                odpl->deactivate_lat = deact_lat;
+                                pr_warning("omap_device: %s.%d: new worst case "
+                                           "deactivate latency %d: %llu\n",
+                                           od->pdev.name, od->pdev.id,
+                                           od->pm_lat_level, deact_lat);
+                        } else
+                                pr_warning("omap_device: %s.%d: deactivate "
+                                           "latency %d higher than exptected. "
+                                           "(%llu > %d)\n",
+                                           od->pdev.name, od->pdev.id,
+                                           od->pm_lat_level, deact_lat,
+                                           odpl->deactivate_lat);
+                }
+
 
                 od->dev_wakeup_lat += odpl->activate_lat;