Skip to content

Commit

Permalink
media: atmel: move microchip_csi2dc to dedicated microchip platform
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ehristev authored and Hans Verkuil committed Nov 18, 2022
1 parent c4a7df4 commit 5c01856
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions drivers/media/platform/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions drivers/media/platform/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
15 changes: 0 additions & 15 deletions drivers/media/platform/atmel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 0 additions & 1 deletion drivers/media/platform/atmel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 19 additions & 0 deletions drivers/media/platform/microchip/Kconfig
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 3 additions & 0 deletions drivers/media/platform/microchip/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) += microchip-csi2dc.o

0 comments on commit 5c01856

Please sign in to comment.