media: rcar-csi2: Move driver to renesas directory

The rcar-csi2 driver was added before the platform/renesas directory
existed and since it was used together in a pipeline with the rcar-vin
driver it was located together with it.

The rcar-isp driver can also be used together with the rcar-csi2 driver
in a pipeline that is terminated by the rcar-vin driver. However by the
time rcar-isp was added the platform/renesas directory existed so it was
added there.

To remove the confusion that the rcar-csi2 driver have code dependencies
on the rcar-vin driver move it to the same directory level as the
rcar-isp driver. This makes it clear they are three distinct drivers
that can be used together in a pipeline, but do not depend on each
other.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/MAINTAINERS b/MAINTAINERS
index 1a89e0d2ac61f25f9f7a5f88676ef7ba36ef1632..83b7d3745336622b9b563dab43873105148e6f5a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13579,6 +13579,7 @@ T:      git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/renesas,csi2.yaml
 F:     Documentation/devicetree/bindings/media/renesas,isp.yaml
 F:     Documentation/devicetree/bindings/media/renesas,vin.yaml
+F:     drivers/media/platform/renesas/rcar-csi2.c
 F:     drivers/media/platform/renesas/rcar-isp.c
 F:     drivers/media/platform/renesas/rcar-vin/
 

diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig
index ed788e991f74b386c1b164f276e1a56a9c37a6fd..c7fc718a30a5e2e358f26ea52ceed440d4076654 100644 (file)
--- a/drivers/media/platform/renesas/Kconfig
+++ b/drivers/media/platform/renesas/Kconfig
@@ -14,6 +14,22 @@ config VIDEO_RENESAS_CEU
        help
          This is a v4l2 driver for the Renesas CEU Interface
 
+config VIDEO_RCAR_CSI2
+       tristate "R-Car MIPI CSI-2 Receiver"
+       depends on V4L_PLATFORM_DRIVERS
+       depends on VIDEO_DEV && OF
+       depends on ARCH_RENESAS || COMPILE_TEST
+       select MEDIA_CONTROLLER
+       select VIDEO_V4L2_SUBDEV_API
+       select RESET_CONTROLLER
+       select V4L2_FWNODE
+       help
+         Support for Renesas R-Car MIPI CSI-2 receiver.
+         Supports R-Car Gen3 and RZ/G2 SoCs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rcar-csi2.
+
 config VIDEO_RCAR_ISP
        tristate "R-Car Image Signal Processor (ISP)"
        depends on V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/renesas/Makefile b/drivers/media/platform/renesas/Makefile
index 55854e8688870f553c0925fbde52d78fa958c0cd..50774a20330c91fe6285a2d515b7ad3fb4643fc3 100644 (file)
--- a/drivers/media/platform/renesas/Makefile
+++ b/drivers/media/platform/renesas/Makefile
@@ -7,6 +7,7 @@ obj-y += rcar-vin/
 obj-y += rzg2l-cru/
 obj-y += vsp1/
 
+obj-$(CONFIG_VIDEO_RCAR_CSI2) += rcar-csi2.o
 obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o
 obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o
 obj-$(CONFIG_VIDEO_RENESAS_CEU) += renesas-ceu.o

diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
similarity index 100%
rename from drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
rename to drivers/media/platform/renesas/rcar-csi2.c

diff --git a/drivers/media/platform/renesas/rcar-vin/Kconfig b/drivers/media/platform/renesas/rcar-vin/Kconfig
index de55fe63d84cf8fd7c660c5f62004b8d93274af3..2ec857ab83cb4e7c4da40b3ca2e7e09571d3ea77 100644 (file)
--- a/drivers/media/platform/renesas/rcar-vin/Kconfig
+++ b/drivers/media/platform/renesas/rcar-vin/Kconfig
@@ -1,20 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-config VIDEO_RCAR_CSI2
-       tristate "R-Car MIPI CSI-2 Receiver"
-       depends on V4L_PLATFORM_DRIVERS
-       depends on VIDEO_DEV && OF
-       depends on ARCH_RENESAS || COMPILE_TEST
-       select MEDIA_CONTROLLER
-       select VIDEO_V4L2_SUBDEV_API
-       select RESET_CONTROLLER
-       select V4L2_FWNODE
-       help
-         Support for Renesas R-Car MIPI CSI-2 receiver.
-         Supports R-Car Gen3 and RZ/G2 SoCs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called rcar-csi2.
-
 config VIDEO_RCAR_VIN
        tristate "R-Car Video Input (VIN) Driver"
        depends on V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/renesas/rcar-vin/Makefile b/drivers/media/platform/renesas/rcar-vin/Makefile
index 00d809f5d2c100ffe2f7d385db35f4c07995f90b..5938ad6290c84e2d0ee6e84aed93b0d10963c028 100644 (file)
--- a/drivers/media/platform/renesas/rcar-vin/Makefile
+++ b/drivers/media/platform/renesas/rcar-vin/Makefile
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 rcar-vin-objs = rcar-core.o rcar-dma.o rcar-v4l2.o
 
-obj-$(CONFIG_VIDEO_RCAR_CSI2) += rcar-csi2.o
 obj-$(CONFIG_VIDEO_RCAR_VIN) += rcar-vin.o