[PATCH 2/8] media: imx: Rename imx7-mipi-csis.c to imx-mipi-csis.c

[Laurent Pinchart]

Hi Jacopo,

Thank you for the patch.

On Mon, Feb 14, 2022 at 07:43:12PM +0100, Jacopo Mondi wrote:
> Rename the imx7-mipi-csis.c driver to remove the reference to i.MX7.
> 
> The driver is for an IP core found on i.MX7 and i.MX8 SoC, so do not
> specify a SoC version number in the driver name.
> 
> Remove the references to the i.MX7 SoC in the driver symbols and expand
> the driver's header with more information about the IP core the driver
> controls.
> 
> Also rename the associated bindings documentation.
> 
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
> ---
>  Documentation/admin-guide/media/imx7.rst               |  2 +-
>  ...{nxp,imx7-mipi-csi2.yaml => nxp,imx-mipi-csi2.yaml} |  2 +-
>  MAINTAINERS                                            |  4 ++--
>  drivers/media/platform/imx/Makefile                    |  2 +-
>  .../platform/imx/{imx7-mipi-csis.c => imx-mipi-csis.c} | 10 +++++++---
>  5 files changed, 12 insertions(+), 8 deletions(-)
>  rename Documentation/devicetree/bindings/media/{nxp,imx7-mipi-csi2.yaml => nxp,imx-mipi-csi2.yaml} (98%)
>  rename drivers/media/platform/imx/{imx7-mipi-csis.c => imx-mipi-csis.c} (99%)
> 
> diff --git a/Documentation/admin-guide/media/imx7.rst b/Documentation/admin-guide/media/imx7.rst
> index 4785ae8ac978..2fa27718f52a 100644
> --- a/Documentation/admin-guide/media/imx7.rst
> +++ b/Documentation/admin-guide/media/imx7.rst
> @@ -33,7 +33,7 @@ reference manual [#f1]_.
>  Entities
>  --------
>  
> -imx7-mipi-csi2
> +imx-mipi-csi2
>  --------------
>  
>  This is the MIPI CSI-2 receiver entity. It has one sink pad to receive the pixel
> diff --git a/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
> similarity index 98%
> rename from Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
> rename to Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
> index e2e6e9aa0fe6..36b135bf9f2a 100644
> --- a/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
> +++ b/Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
> @@ -1,7 +1,7 @@
>  # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>  %YAML 1.2
>  ---
> -$id: http://devicetree.org/schemas/media/nxp,imx7-mipi-csi2.yaml#
> +$id: http://devicetree.org/schemas/media/nxp,imx-mipi-csi2.yaml#
>  $schema: http://devicetree.org/meta-schemas/core.yaml#
>  
>  title: NXP i.MX7 and i.MX8 MIPI CSI-2 receiver
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 5bdb8c881b0b..d919ea3ed250 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -11889,9 +11889,9 @@ L:	linux-media at vger.kernel.org
>  S:	Maintained
>  T:	git git://linuxtv.org/media_tree.git
>  F:	Documentation/admin-guide/media/imx7.rst
> +F:	Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
>  F:	Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
> -F:	Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
> -F:	drivers/media/platform/imx/imx7-mipi-csis.c
> +F:	drivers/media/platform/imx/imx-mipi-csis.c
>  F:	drivers/staging/media/imx/imx7-media-csi.c
>  
>  MEDIA DRIVERS FOR HELENE
> diff --git a/drivers/media/platform/imx/Makefile b/drivers/media/platform/imx/Makefile
> index ee272234c8d7..f72bdbe8e6ef 100644
> --- a/drivers/media/platform/imx/Makefile
> +++ b/drivers/media/platform/imx/Makefile
> @@ -1 +1 @@
> -obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx7-mipi-csis.o
> +obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
> diff --git a/drivers/media/platform/imx/imx7-mipi-csis.c b/drivers/media/platform/imx/imx-mipi-csis.c
> similarity index 99%
> rename from drivers/media/platform/imx/imx7-mipi-csis.c
> rename to drivers/media/platform/imx/imx-mipi-csis.c
> index a22d0e6b3d44..f433758c8935 100644
> --- a/drivers/media/platform/imx/imx7-mipi-csis.c
> +++ b/drivers/media/platform/imx/imx-mipi-csis.c
> @@ -1,6 +1,10 @@
>  // SPDX-License-Identifier: GPL-2.0
>  /*
> - * Freescale i.MX7 SoC series MIPI-CSI V3.3 receiver driver
> + * Samsung CSIS MIPI CSI-2 receiver driver.
> + *
> + * The Samsung CSIS IP is a MIPI CSI-2 receiver found in various NXP i.MX7 and
> + * i.MX8 SoCs. The i.MX7 features version 3.3 of the IP, while i.MX8 features
> + * version 3.6.3

s/$/./

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

>   *
>   * Copyright (C) 2019 Linaro Ltd
>   * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. All Rights Reserved.
> @@ -31,7 +35,7 @@
>  #include <media/v4l2-mc.h>
>  #include <media/v4l2-subdev.h>
>  
> -#define CSIS_DRIVER_NAME			"imx7-mipi-csis"
> +#define CSIS_DRIVER_NAME			"imx-mipi-csis"
>  
>  #define CSIS_PAD_SINK				0
>  #define CSIS_PAD_SOURCE				1
> @@ -1515,4 +1519,4 @@ module_platform_driver(mipi_csis_driver);
>  
>  MODULE_DESCRIPTION("i.MX7 & i.MX8 MIPI CSI-2 receiver driver");
>  MODULE_LICENSE("GPL v2");
> -MODULE_ALIAS("platform:imx7-mipi-csi2");
> +MODULE_ALIAS("platform:imx-mipi-csi2");

-- 
Regards,

Laurent Pinchart