Skip to content

Commit

Permalink
media: cadence: csi2rx: configure DPHY before starting source stream
Browse files Browse the repository at this point in the history
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: 3295cf1 ("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>
  • Loading branch information
Pratyush Yadav authored and Hans Verkuil committed Apr 22, 2024
1 parent 4bc6073 commit fd64dda
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions drivers/media/platform/cadence/cdns-csi2rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
}

/*
Expand Down Expand Up @@ -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);

Expand All @@ -312,6 +310,10 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
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);

Expand Down

0 comments on commit fd64dda

Please sign in to comment.