Hi Sebastien,
Thanks for the patch.
On Wed 31 Jul 2019 at 17:33, Sébastien Szymanski wrote:
> i.MX7 and i.MX6UL/L have the same CSI controller. So add i.MX6UL/L support
> to imx7-media-csi driver.
>
> Signed-off-by: Sébastien Szymanski <sebastien.szyman...@armadeus.com>
>
LGTM. Thanks for adding the support to this imx6ul/l soc.
Reviewed-by: Rui Miguel Silva <rmf...@gmail.com>
---
Cheers,
Rui
> ---
>
> Changes for v3:
> - rebase on Linux v5.3-rc2
> - remove csi_soc_id var as it's not needed anymore thanks to commit
> e0c76a7d3428 ("media: imx7-media-csi: get csi upstream endpoint")
>
> Changes for v2:
> - rebase on top of linuxtv/master
> - mention i.MX6UL/L in header and Kconfig help text
> - rename csi_type to csi_soc_id
>
> drivers/staging/media/imx/Kconfig | 4 +--
> drivers/staging/media/imx/imx7-media-csi.c | 30 +++++++++++++++-------
> 2 files changed, 23 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/media/imx/Kconfig
> b/drivers/staging/media/imx/Kconfig
> index 4c726345dc25..f51476243016 100644
> --- a/drivers/staging/media/imx/Kconfig
> +++ b/drivers/staging/media/imx/Kconfig
> @@ -22,11 +22,11 @@ config VIDEO_IMX_CSI
> A video4linux camera sensor interface driver for i.MX5/6.
>
> config VIDEO_IMX7_CSI
> - tristate "i.MX7 Camera Sensor Interface driver"
> + tristate "i.MX6UL/L / i.MX7 Camera Sensor Interface driver"
> depends on VIDEO_IMX_MEDIA && VIDEO_DEV && I2C
> default y
> help
> Enable support for video4linux camera sensor interface driver for
> - i.MX7.
> + i.MX6UL/L or i.MX7.
> endmenu
> endif
> diff --git a/drivers/staging/media/imx/imx7-media-csi.c
> b/drivers/staging/media/imx/imx7-media-csi.c
> index 500b4c08d967..4ca79ff4c9b3 100644
> --- a/drivers/staging/media/imx/imx7-media-csi.c
> +++ b/drivers/staging/media/imx/imx7-media-csi.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * V4L2 Capture CSI Subdev for Freescale i.MX7 SOC
> + * V4L2 Capture CSI Subdev for Freescale i.MX6UL/L / i.MX7 SOC
> *
> * Copyright (c) 2019 Linaro Ltd
> *
> @@ -765,6 +765,7 @@ static int imx7_csi_configure(struct imx7_csi *csi)
> struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
> __u32 in_code = csi->format_mbus[IMX7_CSI_PAD_SINK].code;
> u32 cr1, cr18;
> + int width = out_pix->width;
>
> if (out_pix->field == V4L2_FIELD_INTERLACED) {
> imx7_csi_deinterlace_enable(csi, true);
> @@ -774,15 +775,27 @@ static int imx7_csi_configure(struct imx7_csi *csi)
> imx7_csi_buf_stride_set(csi, 0);
> }
>
> - imx7_csi_set_imagpara(csi, out_pix->width, out_pix->height);
> + cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
> +
> + if (!csi->is_csi2) {
> + if (out_pix->pixelformat == V4L2_PIX_FMT_UYVY ||
> + out_pix->pixelformat == V4L2_PIX_FMT_YUYV)
> + width *= 2;
> +
> + imx7_csi_set_imagpara(csi, width, out_pix->height);
> +
> + cr18 |= (BIT_BASEADDR_SWITCH_EN | BIT_BASEADDR_SWITCH_SEL |
> + BIT_BASEADDR_CHG_ERR_EN);
> + imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
>
> - if (!csi->is_csi2)
> return 0;
> + }
> +
> + imx7_csi_set_imagpara(csi, width, out_pix->height);
>
> cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
> cr1 &= ~BIT_GCLK_MODE;
>
> - cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
> cr18 &= BIT_MIPI_DATA_FORMAT_MASK;
> cr18 |= BIT_DATA_FROM_MIPI;
>
> @@ -817,11 +830,9 @@ static void imx7_csi_enable(struct imx7_csi *csi)
> {
> imx7_csi_sw_reset(csi);
>
> - if (csi->is_csi2) {
> - imx7_csi_dmareq_rff_enable(csi);
> - imx7_csi_hw_enable_irq(csi);
> - imx7_csi_hw_enable(csi);
> - }
> + imx7_csi_dmareq_rff_enable(csi);
> + imx7_csi_hw_enable_irq(csi);
> + imx7_csi_hw_enable(csi);
> }
>
> static void imx7_csi_disable(struct imx7_csi *csi)
> @@ -1302,6 +1313,7 @@ static int imx7_csi_remove(struct platform_device *pdev)
>
> static const struct of_device_id imx7_csi_of_match[] = {
> { .compatible = "fsl,imx7-csi" },
> + { .compatible = "fsl,imx6ul-csi" },
> { },
> };
> MODULE_DEVICE_TABLE(of, imx7_csi_of_match);
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
