[PATCH v3 17/31] media: synopsys: move imx6-mipi-csi2.c to synopsys/mipi-csi2.c

Frank Li posted 31 patches 5 months, 3 weeks ago
[PATCH v3 17/31] media: synopsys: move imx6-mipi-csi2.c to synopsys/mipi-csi2.c
Posted by Frank Li 5 months, 3 weeks ago
Move dw MIPI CSI2 common part drivers/staging/media/imx/imx6-mipi-csi2.c
under synopsys to let more SoC can reuse it.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/media/platform/synopsys/Kconfig                      | 12 ++++++++++++
 drivers/media/platform/synopsys/Makefile                     |  2 ++
 .../imx6-mipi-csi2.c => media/platform/synopsys/mipi-csi2.c} |  0
 drivers/staging/media/imx/Kconfig                            |  1 +
 drivers/staging/media/imx/Makefile                           |  2 +-
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/synopsys/Kconfig b/drivers/media/platform/synopsys/Kconfig
index 4fd521f78425a96985fa3b6b017deef36631d1a9..e54dad835349d420dead6d5313c0623567c28c0b 100644
--- a/drivers/media/platform/synopsys/Kconfig
+++ b/drivers/media/platform/synopsys/Kconfig
@@ -1,3 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+config VIDEO_SYNOPSYS_MIPI_CSI2
+        tristate "Synopsys DesignWare MIPI CSI2 Receiver common library"
+        depends on VIDEO_DEV
+        select MEDIA_CONTROLLER
+        select VIDEO_V4L2_SUBDEV_API
+        select VIDEOBUF2_DMA_CONTIG
+        help
+          Common library for MIPI CSI2 Controller.
+
+          To compile this driver as a module, choose M here. The module
+          will be called synopsys_hdmirx
+
 source "drivers/media/platform/synopsys/hdmirx/Kconfig"
diff --git a/drivers/media/platform/synopsys/Makefile b/drivers/media/platform/synopsys/Makefile
index 3b12c574dd67c072901108d88cad64ca3a723938..045ed3177738e6d28aa223804b79e6774e141dc8 100644
--- a/drivers/media/platform/synopsys/Makefile
+++ b/drivers/media/platform/synopsys/Makefile
@@ -1,2 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-y += hdmirx/
+
+obj-$(CONFIG_VIDEO_SYNOPSYS_MIPI_CSI2) += mipi-csi2.o
diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/media/platform/synopsys/mipi-csi2.c
similarity index 100%
rename from drivers/staging/media/imx/imx6-mipi-csi2.c
rename to drivers/media/platform/synopsys/mipi-csi2.c
diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig
index 1cd48028b6416ae16ed69c68186281b6c6bcbec8..53e5c1546ac53e4942974a9acdcf078de1cb6073 100644
--- a/drivers/staging/media/imx/Kconfig
+++ b/drivers/staging/media/imx/Kconfig
@@ -10,6 +10,7 @@ config VIDEO_IMX_MEDIA
 	select V4L2_MEM2MEM_DEV
 	select VIDEOBUF2_DMA_CONTIG
 	select VIDEO_V4L2_SUBDEV_API
+	select VIDEO_SYNOPSYS_MIPI_CSI2
 	help
 	  Say yes here to enable support for video4linux media controller
 	  drivers for the i.MX5/6 SOC.
diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index 064a6c6c069aa440c72a483080cbedf89d370193..1978b82fd1876566acbb952a4d14cf9aca35e996 100644
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -11,4 +11,4 @@ imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
 obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
 obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
 obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media-csi.o
-obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-mipi-csi2.o imx6-csi2.o
+obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-csi2.o

-- 
2.34.1
Re: [PATCH v3 17/31] media: synopsys: move imx6-mipi-csi2.c to synopsys/mipi-csi2.c
Posted by Sakari Ailus 3 months, 2 weeks ago
Hi Frank,

On Thu, Aug 21, 2025 at 04:15:52PM -0400, Frank Li wrote:
> Move dw MIPI CSI2 common part drivers/staging/media/imx/imx6-mipi-csi2.c
> under synopsys to let more SoC can reuse it.
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
>  drivers/media/platform/synopsys/Kconfig                      | 12 ++++++++++++
>  drivers/media/platform/synopsys/Makefile                     |  2 ++
>  .../imx6-mipi-csi2.c => media/platform/synopsys/mipi-csi2.c} |  0
>  drivers/staging/media/imx/Kconfig                            |  1 +
>  drivers/staging/media/imx/Makefile                           |  2 +-
>  5 files changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/synopsys/Kconfig b/drivers/media/platform/synopsys/Kconfig
> index 4fd521f78425a96985fa3b6b017deef36631d1a9..e54dad835349d420dead6d5313c0623567c28c0b 100644
> --- a/drivers/media/platform/synopsys/Kconfig
> +++ b/drivers/media/platform/synopsys/Kconfig
> @@ -1,3 +1,15 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  
> +config VIDEO_SYNOPSYS_MIPI_CSI2
> +        tristate "Synopsys DesignWare MIPI CSI2 Receiver common library"
> +        depends on VIDEO_DEV
> +        select MEDIA_CONTROLLER
> +        select VIDEO_V4L2_SUBDEV_API
> +        select VIDEOBUF2_DMA_CONTIG
> +        help
> +          Common library for MIPI CSI2 Controller.
> +
> +          To compile this driver as a module, choose M here. The module
> +          will be called synopsys_hdmirx
> +
>  source "drivers/media/platform/synopsys/hdmirx/Kconfig"
> diff --git a/drivers/media/platform/synopsys/Makefile b/drivers/media/platform/synopsys/Makefile
> index 3b12c574dd67c072901108d88cad64ca3a723938..045ed3177738e6d28aa223804b79e6774e141dc8 100644
> --- a/drivers/media/platform/synopsys/Makefile
> +++ b/drivers/media/platform/synopsys/Makefile
> @@ -1,2 +1,4 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  obj-y += hdmirx/
> +
> +obj-$(CONFIG_VIDEO_SYNOPSYS_MIPI_CSI2) += mipi-csi2.o

Please give the module a more specific name.

> diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/media/platform/synopsys/mipi-csi2.c
> similarity index 100%
> rename from drivers/staging/media/imx/imx6-mipi-csi2.c
> rename to drivers/media/platform/synopsys/mipi-csi2.c
> diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig
> index 1cd48028b6416ae16ed69c68186281b6c6bcbec8..53e5c1546ac53e4942974a9acdcf078de1cb6073 100644
> --- a/drivers/staging/media/imx/Kconfig
> +++ b/drivers/staging/media/imx/Kconfig
> @@ -10,6 +10,7 @@ config VIDEO_IMX_MEDIA
>  	select V4L2_MEM2MEM_DEV
>  	select VIDEOBUF2_DMA_CONTIG
>  	select VIDEO_V4L2_SUBDEV_API
> +	select VIDEO_SYNOPSYS_MIPI_CSI2
>  	help
>  	  Say yes here to enable support for video4linux media controller
>  	  drivers for the i.MX5/6 SOC.
> diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
> index 064a6c6c069aa440c72a483080cbedf89d370193..1978b82fd1876566acbb952a4d14cf9aca35e996 100644
> --- a/drivers/staging/media/imx/Makefile
> +++ b/drivers/staging/media/imx/Makefile
> @@ -11,4 +11,4 @@ imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
>  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
>  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
>  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media-csi.o
> -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-mipi-csi2.o imx6-csi2.o
> +obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-csi2.o
> 

-- 
Regards,

Sakari Ailus
Re: [PATCH v3 17/31] media: synopsys: move imx6-mipi-csi2.c to synopsys/mipi-csi2.c
Posted by Frank Li 3 months, 2 weeks ago
On Mon, Oct 27, 2025 at 11:10:39AM +0200, Sakari Ailus wrote:
> Hi Frank,
>
> On Thu, Aug 21, 2025 at 04:15:52PM -0400, Frank Li wrote:
> > Move dw MIPI CSI2 common part drivers/staging/media/imx/imx6-mipi-csi2.c
> > under synopsys to let more SoC can reuse it.
> >
> > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> > ---
> >  drivers/media/platform/synopsys/Kconfig                      | 12 ++++++++++++
> >  drivers/media/platform/synopsys/Makefile                     |  2 ++
> >  .../imx6-mipi-csi2.c => media/platform/synopsys/mipi-csi2.c} |  0
> >  drivers/staging/media/imx/Kconfig                            |  1 +
> >  drivers/staging/media/imx/Makefile                           |  2 +-
> >  5 files changed, 16 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/platform/synopsys/Kconfig b/drivers/media/platform/synopsys/Kconfig
> > index 4fd521f78425a96985fa3b6b017deef36631d1a9..e54dad835349d420dead6d5313c0623567c28c0b 100644
> > --- a/drivers/media/platform/synopsys/Kconfig
> > +++ b/drivers/media/platform/synopsys/Kconfig
> > @@ -1,3 +1,15 @@
> >  # SPDX-License-Identifier: GPL-2.0-only
> >
> > +config VIDEO_SYNOPSYS_MIPI_CSI2
> > +        tristate "Synopsys DesignWare MIPI CSI2 Receiver common library"
> > +        depends on VIDEO_DEV
> > +        select MEDIA_CONTROLLER
> > +        select VIDEO_V4L2_SUBDEV_API
> > +        select VIDEOBUF2_DMA_CONTIG
> > +        help
> > +          Common library for MIPI CSI2 Controller.
> > +
> > +          To compile this driver as a module, choose M here. The module
> > +          will be called synopsys_hdmirx
> > +
> >  source "drivers/media/platform/synopsys/hdmirx/Kconfig"
> > diff --git a/drivers/media/platform/synopsys/Makefile b/drivers/media/platform/synopsys/Makefile
> > index 3b12c574dd67c072901108d88cad64ca3a723938..045ed3177738e6d28aa223804b79e6774e141dc8 100644
> > --- a/drivers/media/platform/synopsys/Makefile
> > +++ b/drivers/media/platform/synopsys/Makefile
> > @@ -1,2 +1,4 @@
> >  # SPDX-License-Identifier: GPL-2.0-only
> >  obj-y += hdmirx/
> > +
> > +obj-$(CONFIG_VIDEO_SYNOPSYS_MIPI_CSI2) += mipi-csi2.o
>
> Please give the module a more specific name.

How about dw-mipi-csi2.o? but it is already under synopsys. Our spec only
show synopsys mipi csi2, and have not code naming for it.

Or mipi-csi2-v150.o (but it also supports more versions).

which one do you prefer?

Frank

>
> > diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/media/platform/synopsys/mipi-csi2.c
> > similarity index 100%
> > rename from drivers/staging/media/imx/imx6-mipi-csi2.c
> > rename to drivers/media/platform/synopsys/mipi-csi2.c
> > diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig
> > index 1cd48028b6416ae16ed69c68186281b6c6bcbec8..53e5c1546ac53e4942974a9acdcf078de1cb6073 100644
> > --- a/drivers/staging/media/imx/Kconfig
> > +++ b/drivers/staging/media/imx/Kconfig
> > @@ -10,6 +10,7 @@ config VIDEO_IMX_MEDIA
> >  	select V4L2_MEM2MEM_DEV
> >  	select VIDEOBUF2_DMA_CONTIG
> >  	select VIDEO_V4L2_SUBDEV_API
> > +	select VIDEO_SYNOPSYS_MIPI_CSI2
> >  	help
> >  	  Say yes here to enable support for video4linux media controller
> >  	  drivers for the i.MX5/6 SOC.
> > diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
> > index 064a6c6c069aa440c72a483080cbedf89d370193..1978b82fd1876566acbb952a4d14cf9aca35e996 100644
> > --- a/drivers/staging/media/imx/Makefile
> > +++ b/drivers/staging/media/imx/Makefile
> > @@ -11,4 +11,4 @@ imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
> >  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
> >  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
> >  obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media-csi.o
> > -obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-mipi-csi2.o imx6-csi2.o
> > +obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-csi2.o
> >
>
> --
> Regards,
>
> Sakari Ailus
Re: [PATCH v3 17/31] media: synopsys: move imx6-mipi-csi2.c to synopsys/mipi-csi2.c
Posted by Sakari Ailus 3 months, 2 weeks ago
Hi Frank,

On Mon, Oct 27, 2025 at 12:37:34PM -0400, Frank Li wrote:
> On Mon, Oct 27, 2025 at 11:10:39AM +0200, Sakari Ailus wrote:
> > Hi Frank,
> >
> > On Thu, Aug 21, 2025 at 04:15:52PM -0400, Frank Li wrote:
> > > Move dw MIPI CSI2 common part drivers/staging/media/imx/imx6-mipi-csi2.c
> > > under synopsys to let more SoC can reuse it.
> > >
> > > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> > > ---
> > >  drivers/media/platform/synopsys/Kconfig                      | 12 ++++++++++++
> > >  drivers/media/platform/synopsys/Makefile                     |  2 ++
> > >  .../imx6-mipi-csi2.c => media/platform/synopsys/mipi-csi2.c} |  0
> > >  drivers/staging/media/imx/Kconfig                            |  1 +
> > >  drivers/staging/media/imx/Makefile                           |  2 +-
> > >  5 files changed, 16 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/media/platform/synopsys/Kconfig b/drivers/media/platform/synopsys/Kconfig
> > > index 4fd521f78425a96985fa3b6b017deef36631d1a9..e54dad835349d420dead6d5313c0623567c28c0b 100644
> > > --- a/drivers/media/platform/synopsys/Kconfig
> > > +++ b/drivers/media/platform/synopsys/Kconfig
> > > @@ -1,3 +1,15 @@
> > >  # SPDX-License-Identifier: GPL-2.0-only
> > >
> > > +config VIDEO_SYNOPSYS_MIPI_CSI2
> > > +        tristate "Synopsys DesignWare MIPI CSI2 Receiver common library"
> > > +        depends on VIDEO_DEV
> > > +        select MEDIA_CONTROLLER
> > > +        select VIDEO_V4L2_SUBDEV_API
> > > +        select VIDEOBUF2_DMA_CONTIG
> > > +        help
> > > +          Common library for MIPI CSI2 Controller.
> > > +
> > > +          To compile this driver as a module, choose M here. The module
> > > +          will be called synopsys_hdmirx
> > > +
> > >  source "drivers/media/platform/synopsys/hdmirx/Kconfig"
> > > diff --git a/drivers/media/platform/synopsys/Makefile b/drivers/media/platform/synopsys/Makefile
> > > index 3b12c574dd67c072901108d88cad64ca3a723938..045ed3177738e6d28aa223804b79e6774e141dc8 100644
> > > --- a/drivers/media/platform/synopsys/Makefile
> > > +++ b/drivers/media/platform/synopsys/Makefile
> > > @@ -1,2 +1,4 @@
> > >  # SPDX-License-Identifier: GPL-2.0-only
> > >  obj-y += hdmirx/
> > > +
> > > +obj-$(CONFIG_VIDEO_SYNOPSYS_MIPI_CSI2) += mipi-csi2.o
> >
> > Please give the module a more specific name.
> 
> How about dw-mipi-csi2.o? but it is already under synopsys. Our spec only
> show synopsys mipi csi2, and have not code naming for it.
> 
> Or mipi-csi2-v150.o (but it also supports more versions).
> 
> which one do you prefer?

I'd use dw-mipi-csi2.o.

-- 
Regards,

Sakari Ailus