media: cadence: csi2rx: configure DPHY before starting source stream

When the source device is operating above 1.5 Gbps per lane, it needs to
send the Skew Calibration Sequence before sending any HS data. If the
DPHY is initialized after the source stream is started, then it might
miss the sequence and not be able to receive data properly. Move the
start of source subdev to the end of the sequence to make sure
everything is ready to receive data before the source starts streaming.

Signed-off-by: Pratyush Yadav <p.yadav@ti.com>
Fixes: 3295cf1241d3 ("media: cadence: Add support for external dphy")
Tested-by: Julien Massot <julien.massot@collabora.com>
Tested-by: Changhuang Liang <Changhuang.liang@starfivetech.com>
Reviewed-by: Julien Massot <julien.massot@collabora.com>
Reviewed-by: Changhuang Liang <Changhuang.liang@starfivetech.com>
Signed-off-by: Jai Luthra <j-luthra@ti.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index 2d7b0508cc9afa77ebdaaeb45784e862e3bcfe16..6f7d27a48eff044dcb1d6b9c3d3105aa08054011 100644 (file)
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -239,10 +239,6 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
 
        writel(reg, csi2rx->base + CSI2RX_STATIC_CFG_REG);
 
-       ret = v4l2_subdev_call(csi2rx->source_subdev, video, s_stream, true);
-       if (ret)
-               goto err_disable_pclk;
-
        /* Enable DPHY clk and data lanes. */
        if (csi2rx->dphy) {
                reg = CSI2RX_DPHY_CL_EN | CSI2RX_DPHY_CL_RST;
@@ -252,6 +248,13 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
                }
 
                writel(reg, csi2rx->base + CSI2RX_DPHY_LANE_CTRL_REG);
+
+               ret = csi2rx_configure_ext_dphy(csi2rx);
+               if (ret) {
+                       dev_err(csi2rx->dev,
+                               "Failed to configure external DPHY: %d\n", ret);
+                       goto err_disable_pclk;
+               }
        }
 
        /*
@@ -291,14 +294,9 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
 
        reset_control_deassert(csi2rx->sys_rst);
 
-       if (csi2rx->dphy) {
-               ret = csi2rx_configure_ext_dphy(csi2rx);
-               if (ret) {
-                       dev_err(csi2rx->dev,
-                               "Failed to configure external DPHY: %d\n", ret);
-                       goto err_disable_sysclk;
-               }
-       }
+       ret = v4l2_subdev_call(csi2rx->source_subdev, video, s_stream, true);
+       if (ret)
+               goto err_disable_sysclk;
 
        clk_disable_unprepare(csi2rx->p_clk);
 
@@ -312,6 +310,10 @@ err_disable_pixclk:
                clk_disable_unprepare(csi2rx->pixel_clk[i - 1]);
        }
 
+       if (csi2rx->dphy) {
+               writel(0, csi2rx->base + CSI2RX_DPHY_LANE_CTRL_REG);
+               phy_power_off(csi2rx->dphy);
+       }
 err_disable_pclk:
        clk_disable_unprepare(csi2rx->p_clk);