media: ti-vpe: cal: remove wait when stopping camerarx

Asserting ComplexIO reset seems to affect the HW (ie. asserting reset
will break an active capture), but the RESET_DONE bit never changes to
"reset is ongoing" state. Thus we always get a timeout.

Drop the wait, as it seems to achieve nothing.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti-vpe/cal-camerarx.c
index b36e55b63718e6fbed52ba894b4ff191e0582810..a8cca30f3f51e7097d61cf603d05ccf4d235b168 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal-camerarx.c
+++ b/drivers/media/platform/ti-vpe/cal-camerarx.c
@@ -407,7 +407,6 @@ static int cal_camerarx_start(struct cal_camerarx *phy)
 
 static void cal_camerarx_stop(struct cal_camerarx *phy)
 {
-       unsigned int i;
        int ret;
 
        cal_camerarx_ppi_disable(phy);
@@ -421,19 +420,9 @@ static void cal_camerarx_stop(struct cal_camerarx *phy)
                        CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL,
                        CAL_CSI2_COMPLEXIO_CFG_RESET_CTRL_MASK);
 
-       /* Wait for power down completion */
-       for (i = 0; i < 10; i++) {
-               if (cal_read_field(phy->cal,
-                                  CAL_CSI2_COMPLEXIO_CFG(phy->instance),
-                                  CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_MASK) ==
-                   CAL_CSI2_COMPLEXIO_CFG_RESET_DONE_RESETONGOING)
-                       break;
-               usleep_range(1000, 1100);
-       }
-       phy_dbg(3, phy, "CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x Complex IO in Reset (%d) %s\n",
+       phy_dbg(3, phy, "CAL_CSI2_COMPLEXIO_CFG(%d) = 0x%08x Complex IO in Reset\n",
                phy->instance,
-               cal_read(phy->cal, CAL_CSI2_COMPLEXIO_CFG(phy->instance)), i,
-               (i >= 10) ? "(timeout)" : "");
+               cal_read(phy->cal, CAL_CSI2_COMPLEXIO_CFG(phy->instance)));
 
        /* Disable the phy */
        cal_camerarx_disable(phy);