Commit 5b21b566 authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Hans Verkuil
Browse files

media: imx: Rename imx7-mipi-csis.c to imx-mipi-csis.c 



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: default avatarJacopo Mondi <jacopo@jmondi.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 85fa189b

Documentation/admin-guide/media/imx7.rst

+1 −1
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml→Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml

+1 −1
Original line number Diff line number Diff line 
# 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

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -11889,9 +11889,9 @@ L: linux-media@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
































drivers/media/platform/imx/Makefile



+1
−1






























Original line number
Diff line number
Diff line









obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx7-mipi-csis.o








obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
























drivers/media/platform/imx/imx7-mipi-csis.c→drivers/media/platform/imx/imx-mipi-csis.c



+7
−3






























Original line number
Diff line number
Diff line









// 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.









 *









 * 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








@@ -1519,4 +1523,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");