gpu: host1x: mipi: Use readl_relaxed_poll_timeout() in tegra_mipi_wait()

Use readl_relaxed_poll_timeout() in tegra_mipi_wait() to simplify
the code.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/host1x/mipi.c b/drivers/gpu/host1x/mipi.c
index 762d349ad00f1d42123fc4e4b4bb391fa93d4897..259e70c47a38fdeba3318cbcf15e6b4a7ecef5b1 100644 (file)
--- a/drivers/gpu/host1x/mipi.c
+++ b/drivers/gpu/host1x/mipi.c
@@ -21,9 +21,9 @@
  */
 
 #include <linux/clk.h>
-#include <linux/delay.h>
 #include <linux/host1x.h>
 #include <linux/io.h>
+#include <linux/iopoll.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -295,19 +295,15 @@ EXPORT_SYMBOL(tegra_mipi_disable);
 
 static int tegra_mipi_wait(struct tegra_mipi *mipi)
 {
-       unsigned long timeout = jiffies + msecs_to_jiffies(250);
+       void __iomem *status_reg = mipi->regs + (MIPI_CAL_STATUS << 2);
        u32 value;
+       int err;
 
-       while (time_before(jiffies, timeout)) {
-               value = tegra_mipi_readl(mipi, MIPI_CAL_STATUS);
-               if ((value & MIPI_CAL_STATUS_ACTIVE) == 0 &&
-                   (value & MIPI_CAL_STATUS_DONE) != 0)
-                       return 0;
-
-               usleep_range(10, 50);
-       }
-
-       return -ETIMEDOUT;
+       err = readl_relaxed_poll_timeout(status_reg, value,
+                                        !(value & MIPI_CAL_STATUS_ACTIVE) &&
+                                        (value & MIPI_CAL_STATUS_DONE), 50,
+                                        250000);
+       return err;
 }
 
 int tegra_mipi_calibrate(struct tegra_mipi_device *device)