linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Pratyush Yadav <p.yadav@ti.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Kishon Vijay Abraham I <kishon@ti.com>,
	Vinod Koul <vkoul@kernel.org>,
	Peter Ujfalusi <peter.ujfalusi@gmail.com>,
	"Maxime Ripard" <mripard@kernel.org>,
	Benoit Parrot <bparrot@ti.com>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Alexandre Courbot <acourbot@chromium.org>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Stanimir Varbanov <stanimir.varbanov@linaro.org>,
	Helen Koike <helen.koike@collabora.com>,
	Michael Tretter <m.tretter@pengutronix.de>,
	Peter Chen <peter.chen@nxp.com>, <linux-media@vger.kernel.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-phy@lists.infradead.org>, <dmaengine@vger.kernel.org>,
	"Vignesh Raghavendra" <vigneshr@ti.com>,
	Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Subject: Re: [PATCH 05/16] media: cadence: csi2rx: Add external DPHY support
Date: Wed, 31 Mar 2021 17:24:13 +0800	[thread overview]
Message-ID: <1617182653.2752.9.camel@mhfsdcap03> (raw)
In-Reply-To: <20210330173348.30135-6-p.yadav@ti.com>

On Tue, 2021-03-30 at 23:03 +0530, Pratyush Yadav wrote:
> Some platforms like TI's J721E can have the CSI2RX paired with an
> external DPHY. Add support to enable and configure the DPHY using the
> generic PHY framework.
> 
> Get the pixel rate and bpp from the subdev and pass them on to the DPHY
> along with the number of lanes. All other settings are left to their
> default values.
> 
> Signed-off-by: Pratyush Yadav <p.yadav@ti.com>
> ---
>  drivers/media/platform/cadence/cdns-csi2rx.c | 147 +++++++++++++++++--
>  1 file changed, 137 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
> index c68a3eac62cd..31bd80e3f780 100644
> --- a/drivers/media/platform/cadence/cdns-csi2rx.c
> +++ b/drivers/media/platform/cadence/cdns-csi2rx.c
> @@ -30,6 +30,12 @@
>  #define CSI2RX_STATIC_CFG_DLANE_MAP(llane, plane)	((plane) << (16 + (llane) * 4))
>  #define CSI2RX_STATIC_CFG_LANES_MASK			GENMASK(11, 8)
>  
> +#define CSI2RX_DPHY_LANE_CTRL_REG		0x40
> +#define CSI2RX_DPHY_CL_RST			BIT(16)
> +#define CSI2RX_DPHY_DL_RST(i)			BIT((i) + 12)
> +#define CSI2RX_DPHY_CL_EN			BIT(4)
> +#define CSI2RX_DPHY_DL_EN(i)			BIT(i)
> +
>  #define CSI2RX_STREAM_BASE(n)		(((n) + 1) * 0x100)
>  
>  #define CSI2RX_STREAM_CTRL_REG(n)		(CSI2RX_STREAM_BASE(n) + 0x000)
> @@ -54,6 +60,11 @@ enum csi2rx_pads {
>  	CSI2RX_PAD_MAX,
>  };
>  
> +struct csi2rx_fmt {
> +	u32				code;
> +	u8				bpp;
> +};
> +
>  struct csi2rx_priv {
>  	struct device			*dev;
>  	unsigned int			count;
> @@ -85,6 +96,52 @@ struct csi2rx_priv {
>  	int				source_pad;
>  };
>  
> +static const struct csi2rx_fmt formats[] = {
> +	{
> +		.code	= MEDIA_BUS_FMT_YUYV8_2X8,
> +		.bpp	= 16,
> +	},
> +	{
> +		.code	= MEDIA_BUS_FMT_UYVY8_2X8,
> +		.bpp	= 16,
> +	},
> +	{
> +		.code	= MEDIA_BUS_FMT_YVYU8_2X8,
> +		.bpp	= 16,
> +	},
> +	{
> +		.code	= MEDIA_BUS_FMT_VYUY8_2X8,
> +		.bpp	= 16,
> +	},
> +};
> +
> +static u8 csi2rx_get_bpp(u32 code)
> +{
> +	int i;
> +
> +	for (i = 0; i < ARRAY_SIZE(formats); i++) {
> +		if (formats[i].code == code)
> +			return formats[i].bpp;
> +	}
> +
> +	return 0;
> +}
> +
> +static s64 csi2rx_get_pixel_rate(struct csi2rx_priv *csi2rx)
> +{
> +	struct v4l2_ctrl *ctrl;
> +
> +	ctrl = v4l2_ctrl_find(csi2rx->source_subdev->ctrl_handler,
> +			      V4L2_CID_PIXEL_RATE);
> +	if (!ctrl) {
> +		dev_err(csi2rx->dev, "no pixel rate control in subdev: %s\n",
> +			csi2rx->source_subdev->name);
> +		return -EINVAL;
> +	}
> +
> +	return v4l2_ctrl_g_ctrl_int64(ctrl);
> +}
> +
>  static inline
>  struct csi2rx_priv *v4l2_subdev_to_csi2rx(struct v4l2_subdev *subdev)
>  {
> @@ -101,6 +158,55 @@ static void csi2rx_reset(struct csi2rx_priv *csi2rx)
>  	writel(0, csi2rx->base + CSI2RX_SOFT_RESET_REG);
>  }
>  
> +static int csi2rx_configure_external_dphy(struct csi2rx_priv *csi2rx)
> +{
> +	union phy_configure_opts opts = { };
> +	struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy;
> +	struct v4l2_subdev_format sd_fmt;
> +	s64 pixel_rate;
> +	int ret;
> +	u8 bpp;
> +
> +	sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
> +	sd_fmt.pad = 0;
> +
> +	ret = v4l2_subdev_call(csi2rx->source_subdev, pad, get_fmt, NULL,
> +			       &sd_fmt);
> +	if (ret)
> +		return ret;
> +
> +	bpp = csi2rx_get_bpp(sd_fmt.format.code);
> +	if (!bpp)
> +		return -EINVAL;
> +
> +	pixel_rate = csi2rx_get_pixel_rate(csi2rx);
> +	if (pixel_rate < 0)
> +		return pixel_rate;
> +
> +	ret = phy_mipi_dphy_get_default_config(pixel_rate, bpp,
> +					       csi2rx->num_lanes, cfg);
> +	if (ret)
> +		return ret;
> +
> +	ret = phy_set_mode_ext(csi2rx->dphy, PHY_MODE_MIPI_DPHY,
> +			       PHY_MIPI_DPHY_SUBMODE_RX);
> +	if (ret)
> +		return ret;
> +
> +	ret = phy_power_on(csi2rx->dphy);
> +	if (ret)
> +		return ret;
Seems phy_power_on, then phy_set_mode_ext?

> +
> +	ret = phy_configure(csi2rx->dphy, &opts);
> +	if (ret) {
> +		/* Can't do anything if it fails. Ignore the return value. */
> +		phy_power_off(csi2rx->dphy);
> +		return ret;
> +	}
> +
> +	return 0;
> +}
> +
>  static int csi2rx_start(struct csi2rx_priv *csi2rx)
>  {
>  	unsigned int i;
> @@ -139,6 +245,17 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
>  	if (ret)
>  		goto err_disable_pclk;
>  
> +	/* Enable DPHY clk and data lanes. */
> +	if (csi2rx->dphy) {
> +		reg = CSI2RX_DPHY_CL_EN | CSI2RX_DPHY_CL_RST;
> +		for (i = 0; i < csi2rx->num_lanes; i++) {
> +			reg |= CSI2RX_DPHY_DL_EN(csi2rx->lanes[i] - 1);
> +			reg |= CSI2RX_DPHY_DL_RST(csi2rx->lanes[i] - 1);
> +		}
> +
> +		writel(reg, csi2rx->base + CSI2RX_DPHY_LANE_CTRL_REG);
> +	}
> +
>  	/*
>  	 * Create a static mapping between the CSI virtual channels
>  	 * and the output stream.
> @@ -169,10 +286,21 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
>  	if (ret)
>  		goto err_disable_pixclk;
>  
> +	if (csi2rx->dphy) {
> +		ret = csi2rx_configure_external_dphy(csi2rx);
> +		if (ret) {
> +			dev_err(csi2rx->dev,
> +				"Failed to configure external DPHY: %d\n", ret);
> +			goto err_disable_sysclk;
> +		}
> +	}
> +
>  	clk_disable_unprepare(csi2rx->p_clk);
>  
>  	return 0;
>  
> +err_disable_sysclk:
> +	clk_disable_unprepare(csi2rx->sys_clk);
>  err_disable_pixclk:
>  	for (; i > 0; i--)
>  		clk_disable_unprepare(csi2rx->pixel_clk[i - 1]);
> @@ -200,6 +328,13 @@ static void csi2rx_stop(struct csi2rx_priv *csi2rx)
>  
>  	if (v4l2_subdev_call(csi2rx->source_subdev, video, s_stream, false))
>  		dev_warn(csi2rx->dev, "Couldn't disable our subdev\n");
> +
> +	if (csi2rx->dphy) {
> +		writel(0, csi2rx->base + CSI2RX_DPHY_LANE_CTRL_REG);
> +
> +		if (phy_power_off(csi2rx->dphy))
> +			dev_warn(csi2rx->dev, "Couldn't power off DPHY\n");
> +	}
>  }
>  
>  static int csi2rx_s_stream(struct v4l2_subdev *subdev, int enable)
> @@ -306,15 +441,6 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
>  		return PTR_ERR(csi2rx->dphy);
>  	}
>  
> -	/*
> -	 * FIXME: Once we'll have external D-PHY support, the check
> -	 * will need to be removed.
> -	 */
> -	if (csi2rx->dphy) {
> -		dev_err(&pdev->dev, "External D-PHY not supported yet\n");
> -		return -EINVAL;
> -	}
> -
>  	clk_prepare_enable(csi2rx->p_clk);
>  	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
>  	clk_disable_unprepare(csi2rx->p_clk);
> @@ -339,7 +465,7 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
>  	 * FIXME: Once we'll have internal D-PHY support, the check
>  	 * will need to be removed.
>  	 */
> -	if (csi2rx->has_internal_dphy) {
> +	if (!csi2rx->dphy && csi2rx->has_internal_dphy) {
>  		dev_err(&pdev->dev, "Internal D-PHY not supported yet\n");
>  		return -EINVAL;
>  	}
> @@ -460,6 +586,7 @@ static int csi2rx_probe(struct platform_device *pdev)
>  	dev_info(&pdev->dev,
>  		 "Probed CSI2RX with %u/%u lanes, %u streams, %s D-PHY\n",
>  		 csi2rx->num_lanes, csi2rx->max_lanes, csi2rx->max_streams,
> +		 csi2rx->dphy ? "external" :
>  		 csi2rx->has_internal_dphy ? "internal" : "no");
>  
>  	return 0;


  reply	other threads:[~2021-03-31  9:25 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-30 17:33 [PATCH 00/16] CSI2RX support on J721E Pratyush Yadav
2021-03-30 17:33 ` [PATCH 01/16] phy: Distinguish between Rx and Tx for MIPI D-PHY with submodes Pratyush Yadav
2021-03-30 17:33 ` [PATCH 02/16] phy: cdns-dphy: Prepare for Rx support Pratyush Yadav
2021-03-30 17:33 ` [PATCH 03/16] phy: cdns-dphy: Allow setting mode Pratyush Yadav
2021-04-02 10:38   ` Laurent Pinchart
2021-04-06 18:22     ` Pratyush Yadav
2021-03-30 17:33 ` [PATCH 04/16] phy: cdns-dphy: Add Rx support Pratyush Yadav
2021-03-30 17:33 ` [PATCH 05/16] media: cadence: csi2rx: Add external DPHY support Pratyush Yadav
2021-03-31  9:24   ` Chunfeng Yun [this message]
2021-04-06 18:54     ` Pratyush Yadav
2021-04-08  8:13       ` Chunfeng Yun
2021-04-08  8:22         ` Tomi Valkeinen
2021-03-30 17:33 ` [PATCH 06/16] media: cadence: csi2rx: Soft reset the streams before starting capture Pratyush Yadav
2021-03-30 17:33 ` [PATCH 07/16] media: cadence: csi2rx: Set the STOP bit when stopping a stream Pratyush Yadav
2021-03-30 17:33 ` [PATCH 08/16] media: cadence: csi2rx: Fix stream data configuration Pratyush Yadav
2021-03-30 17:33 ` [PATCH 09/16] media: cadence: csi2rx: Turn subdev power on before starting stream Pratyush Yadav
2021-04-02 10:55   ` Laurent Pinchart
2021-04-06 17:53     ` Pratyush Yadav
2021-03-30 17:33 ` [PATCH 10/16] media: cadence: csi2rx: Add wrappers for subdev calls Pratyush Yadav
2021-04-02 10:47   ` Laurent Pinchart
2021-04-06 15:11     ` Pratyush Yadav
2021-03-30 17:33 ` [PATCH 11/16] dmaengine: ti: k3-psil-j721e: Add entry for CSI2RX Pratyush Yadav
2021-04-04 13:24   ` Péter Ujfalusi
2021-04-06 15:09     ` Pratyush Yadav
2021-04-06 15:33       ` Péter Ujfalusi
2021-04-06 16:55         ` Pratyush Yadav
2021-04-06 17:10           ` Pratyush Yadav
2021-04-06 19:13             ` Péter Ujfalusi
2021-03-30 17:33 ` [PATCH 12/16] dt-bindings: media: Add DT bindings for TI CSI2RX driver Pratyush Yadav
2021-03-31 13:40   ` Rob Herring
2021-04-01 15:52   ` Rob Herring
2021-04-02 10:01     ` Laurent Pinchart
2021-04-02 10:53       ` Laurent Pinchart
2021-04-06 18:15         ` Pratyush Yadav
2021-04-06 18:13       ` Pratyush Yadav
2021-04-06 18:00     ` Pratyush Yadav
2021-04-01 15:52   ` Rob Herring
2021-03-30 17:33 ` [PATCH 13/16] media: ti-vpe: csi2rx: Add CSI2RX support Pratyush Yadav
2021-03-31  6:06   ` Tomi Valkeinen
2021-03-31 15:44     ` Benoit Parrot
2021-03-31 15:50       ` Laurent Pinchart
2021-04-06 15:05     ` Pratyush Yadav
2021-04-04 13:38   ` Péter Ujfalusi
2021-03-30 17:33 ` [PATCH 14/16] dt-bindings: phy: Convert Cadence DPHY binding to YAML Pratyush Yadav
2021-04-02 10:23   ` Laurent Pinchart
2021-04-06 18:51     ` Pratyush Yadav
2021-03-30 17:33 ` [PATCH 15/16] dt-bindings: phy: cdns,dphy: make clocks optional Pratyush Yadav
2021-04-02 10:31   ` Laurent Pinchart
2021-04-06 18:48     ` Pratyush Yadav
2021-03-30 17:33 ` [PATCH 16/16] dt-bindings: phy: cdns,dphy: add power-domains property Pratyush Yadav
2021-04-02 10:35   ` Laurent Pinchart
2021-04-06 18:23     ` Pratyush Yadav
2021-03-31  9:33 ` [PATCH 00/16] CSI2RX support on J721E Vinod Koul
2021-03-31 11:40   ` Pratyush Yadav
2021-03-31 13:06     ` Vinod Koul
2021-03-31 13:51       ` Pratyush Yadav
2021-04-02 10:57   ` Laurent Pinchart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1617182653.2752.9.camel@mhfsdcap03 \
    --to=chunfeng.yun@mediatek.com \
    --cc=acourbot@chromium.org \
    --cc=bparrot@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=helen.koike@collabora.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=kishon@ti.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-phy@lists.infradead.org \
    --cc=m.tretter@pengutronix.de \
    --cc=mchehab@kernel.org \
    --cc=mripard@kernel.org \
    --cc=p.yadav@ti.com \
    --cc=peter.chen@nxp.com \
    --cc=peter.ujfalusi@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=stanimir.varbanov@linaro.org \
    --cc=tomi.valkeinen@ideasonboard.com \
    --cc=vigneshr@ti.com \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).