On 25/06/2023 10:09, guoniu.zhou@xxxxxxxxxxx wrote:
> From: "Guoniu.zhou" <guoniu.zhou@xxxxxxx>
>
> ISI is used both in i.MX8 and i.MX9 SoC, so do not specify a SoC
> version number in the driver name and header file.
>
> Signed-off-by: Guoniu.zhou <guoniu.zhou@xxxxxxx>
> ---
> MAINTAINERS | 6 +++---
> drivers/media/platform/nxp/Kconfig | 2 +-
> drivers/media/platform/nxp/Makefile | 2 +-
> .../platform/nxp/{imx8-isi => imx-isi}/Kconfig | 14 +++++++-------
> drivers/media/platform/nxp/imx-isi/Makefile | 8 ++++++++
> .../imx8-isi-core.c => imx-isi/imx-isi-core.c} | 4 ++--
> .../imx8-isi-core.h => imx-isi/imx-isi-core.h} | 2 +-
> .../imx-isi-crossbar.c} | 4 ++--
> .../imx8-isi-debug.c => imx-isi/imx-isi-debug.c} | 4 ++--
> .../imx8-isi-hw.c => imx-isi/imx-isi-hw.c} | 4 ++--
> .../imx8-isi-m2m.c => imx-isi/imx-isi-m2m.c} | 2 +-
> .../imx8-isi-pipe.c => imx-isi/imx-isi-pipe.c} | 4 ++--
> .../imx8-isi-regs.h => imx-isi/imx-isi-regs.h} | 6 +++---
> .../imx8-isi-video.c => imx-isi/imx-isi-video.c} | 8 ++++----
> drivers/media/platform/nxp/imx8-isi/Makefile | 8 --------
> 15 files changed, 39 insertions(+), 39 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c83475103a25..2e2fc3c2b338 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15081,12 +15081,12 @@ F: drivers/iio/adc/imx7d_adc.c
> F: drivers/iio/adc/imx93_adc.c
> F: drivers/iio/adc/vf610_adc.c
>
> -NXP i.MX 8M ISI DRIVER
> +NXP i.MX ISI DRIVER
> M: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> L: linux-media@xxxxxxxxxxxxxxx
> S: Maintained
> -F: Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> -F: drivers/media/platform/nxp/imx8-isi/
No, your patchset is not bistectable.
> +F: Documentation/devicetree/bindings/media/nxp,imx-isi.yaml
> +F: drivers/media/platform/nxp/imx-isi/
>
> NXP i.MX 8MP DW100 V4L2 DRIVER
> M: Xavier Roumegue <xavier.roumegue@xxxxxxxxxxx>
> diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
> index a0ca6b297fb8..55ce6a44b3fd 100644
> --- a/drivers/media/platform/nxp/Kconfig
> +++ b/drivers/media/platform/nxp/Kconfig
> @@ -28,7 +28,7 @@ config VIDEO_IMX_MIPI_CSIS
> Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
> v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
>
> -source "drivers/media/platform/nxp/imx8-isi/Kconfig"
> +source "drivers/media/platform/nxp/imx-isi/Kconfig"
There is no need for this.
>
> # mem2mem drivers
>
> diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile
> index b8e672b75fed..c95d23f1f521 100644
> --- a/drivers/media/platform/nxp/Makefile
> +++ b/drivers/media/platform/nxp/Makefile
> @@ -2,7 +2,7 @@
>
> obj-y += dw100/
> obj-y += imx-jpeg/
> -obj-y += imx8-isi/
> +obj-y += imx-isi/
>
> obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
> obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
> diff --git a/drivers/media/platform/nxp/imx8-isi/Kconfig b/drivers/media/platform/nxp/imx-isi/Kconfig
> similarity index 60%
> rename from drivers/media/platform/nxp/imx8-isi/Kconfig
> rename to drivers/media/platform/nxp/imx-isi/Kconfig
> index fcff33fc2630..ce222fa67a2f 100644
> --- a/drivers/media/platform/nxp/imx8-isi/Kconfig
> +++ b/drivers/media/platform/nxp/imx-isi/Kconfig
> @@ -1,22 +1,22 @@
> # SPDX-License-Identifier: GPL-2.0-only
>
> -config VIDEO_IMX8_ISI
> - tristate "i.MX8 Image Sensor Interface (ISI) driver"
> +config VIDEO_IMX_ISI
> + tristate "i.MX Image Sensor Interface (ISI) driver"
> depends on ARCH_MXC || COMPILE_TEST
> depends on HAS_DMA && PM
> depends on VIDEO_DEV
> select MEDIA_CONTROLLER
> select V4L2_FWNODE
> - select V4L2_MEM2MEM_DEV if VIDEO_IMX8_ISI_M2M
> + select V4L2_MEM2MEM_DEV if VIDEO_IMX_ISI_M2M
> select VIDEO_V4L2_SUBDEV_API
> select VIDEOBUF2_DMA_CONTIG
> help
> V4L2 driver for the Image Sensor Interface (ISI) found in various
> - i.MX8 SoCs.
> + i.MX SoCs.
>
> -config VIDEO_IMX8_ISI_M2M
> - bool "i.MX8 Image Sensor Interface (ISI) memory-to-memory support"
> - depends on VIDEO_IMX8_ISI
> +config VIDEO_IMX_ISI_M2M
> + bool "i.MX Image Sensor Interface (ISI) memory-to-memory support"
> + depends on VIDEO_IMX_ISI
> help
> Select 'yes' here to enable support for memory-to-memory processing
> in the ISI driver.
> diff --git a/drivers/media/platform/nxp/imx-isi/Makefile b/drivers/media/platform/nxp/imx-isi/Makefile
> new file mode 100644
> index 000000000000..f72e0ce8f17d
> --- /dev/null
> +++ b/drivers/media/platform/nxp/imx-isi/Makefile
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +
> +imx-isi-y := imx-isi-core.o imx-isi-crossbar.o imx-isi-hw.o \
> + imx-isi-pipe.o imx-isi-video.o
> +imx-isi-$(CONFIG_DEBUG_FS) += imx-isi-debug.o
> +imx-isi-$(CONFIG_VIDEO_IMX_ISI_M2M) += imx-isi-m2m.o
> +
> +obj-$(CONFIG_VIDEO_IMX_ISI) += imx-isi.o
> diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
> similarity index 99%
> rename from drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> rename to drivers/media/platform/nxp/imx-isi/imx-isi-core.c
> index 253e77189b69..cd5678139ddf 100644
> --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> +++ b/drivers/media/platform/nxp/imx-isi/imx-isi-core.c
Stop renaming everything. You affect users of modules, make backporting
a bit trickier for no real reason.
Best regards,
Krzysztof
