media: atmel: move microchip_csi2dc to dedicated microchip platform

The Atmel ISC will be moved to staging thus the atmel platform will only
have the ISI driver.
The new media-controller converted ISC driver will be placed inside a
dedicated microchip platform directory.
It is then natural to have the microchip-csi2dc moved to this new platform
directory.
The next step is to add the Microchip ISC driver to the new platform
directory and reside together with the Microchip CSI2DC driver.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/MAINTAINERS b/MAINTAINERS
index 1f0e2fd..9450fae 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13466,7 +13466,7 @@ M:      Eugen Hristev <eugen.hristev@microchip.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
-F:     drivers/media/platform/atmel/microchip-csi2dc.c
+F:     drivers/media/platform/microchip/microchip-csi2dc.c
 
 MICROCHIP ECC DRIVER
 M:     Tudor Ambarus <tudor.ambarus@microchip.com>

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index a933426..ee57991 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -72,6 +72,7 @@ source "drivers/media/platform/chips-media/Kconfig"
 source "drivers/media/platform/intel/Kconfig"
 source "drivers/media/platform/marvell/Kconfig"
 source "drivers/media/platform/mediatek/Kconfig"
+source "drivers/media/platform/microchip/Kconfig"
 source "drivers/media/platform/nvidia/Kconfig"
 source "drivers/media/platform/nxp/Kconfig"
 source "drivers/media/platform/qcom/Kconfig"

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index a91f420..5453bb8 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -15,6 +15,7 @@ obj-y += chips-media/
 obj-y += intel/
 obj-y += marvell/
 obj-y += mediatek/
+obj-y += microchip/
 obj-y += nvidia/
 obj-y += nxp/
 obj-y += qcom/

diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index f399dba..6d07a31 100644 (file)
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -49,18 +49,3 @@ config VIDEO_ATMEL_ISI
          This module makes the ATMEL Image Sensor Interface available
          as a v4l2 device.
 
-config VIDEO_MICROCHIP_CSI2DC
-       tristate "Microchip CSI2 Demux Controller"
-       depends on V4L_PLATFORM_DRIVERS
-       depends on VIDEO_DEV && COMMON_CLK && OF
-       depends on ARCH_AT91 || COMPILE_TEST
-       select MEDIA_CONTROLLER
-       select VIDEO_V4L2_SUBDEV_API
-       select V4L2_FWNODE
-       help
-         CSI2 Demux Controller driver. CSI2DC is a helper chip
-         that converts IDI interface byte stream to a parallel pixel stream.
-         It supports various RAW formats as input.
-
-         To compile this driver as a module, choose M here: the
-         module will be called microchip-csi2dc.

diff --git a/drivers/media/platform/atmel/Makefile b/drivers/media/platform/atmel/Makefile
index 794e8f7..ab3890f 100644 (file)
--- a/drivers/media/platform/atmel/Makefile
+++ b/drivers/media/platform/atmel/Makefile
@@ -7,4 +7,3 @@ obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel-isi.o
 obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += atmel-isc-common.o
 obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel-isc.o
 obj-$(CONFIG_VIDEO_ATMEL_XISC) += atmel-xisc.o
-obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += microchip-csi2dc.o

diff --git a/drivers/media/platform/microchip/Kconfig b/drivers/media/platform/microchip/Kconfig
new file mode 100644 (file)
index 0000000..aa9e902
--- /dev/null
+++ b/drivers/media/platform/microchip/Kconfig
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Microchip Technology, Inc. media platform drivers"
+
+config VIDEO_MICROCHIP_CSI2DC
+       tristate "Microchip CSI2 Demux Controller"
+       depends on V4L_PLATFORM_DRIVERS
+       depends on VIDEO_DEV && COMMON_CLK && OF
+       depends on ARCH_AT91 || COMPILE_TEST
+       select MEDIA_CONTROLLER
+       select VIDEO_V4L2_SUBDEV_API
+       select V4L2_FWNODE
+       help
+         CSI2 Demux Controller driver. CSI2DC is a helper chip
+         that converts IDI interface byte stream to a parallel pixel stream.
+         It supports various RAW formats as input.
+
+         To compile this driver as a module, choose M here: the
+         module will be called microchip-csi2dc.

diff --git a/drivers/media/platform/microchip/Makefile b/drivers/media/platform/microchip/Makefile
new file mode 100644 (file)
index 0000000..cbcde4a
--- /dev/null
+++ b/drivers/media/platform/microchip/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += microchip-csi2dc.o

diff --git a/drivers/media/platform/atmel/microchip-csi2dc.c b/drivers/media/platform/microchip/microchip-csi2dc.c
similarity index 100%
rename from drivers/media/platform/atmel/microchip-csi2dc.c
rename to drivers/media/platform/microchip/microchip-csi2dc.c