]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
media: davinci: deprecate dm644x_ccdc, dm355_cddc and dm365_isif
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Thu, 11 Aug 2022 09:17:47 +0000 (11:17 +0200)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Mon, 29 Aug 2022 14:45:34 +0000 (16:45 +0200)
Deprecate the dm644x_ccdc, dm355_cddc and dm365_isif davinci drivers:
all three depend on the vpfe_capture driver, and that driver does not
use the vb2 framework for video streaming, instead it uses the old
videobuf framework.

We want to get rid of these old drivers, so deprecated these for future
removal.

Note that include/media/davinci/vpfe_capture.h can't be moved to staging
since it is used in arch/arm/mach-davinci/davinci.h.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
19 files changed:
MAINTAINERS
drivers/media/platform/ti/davinci/Kconfig
drivers/media/platform/ti/davinci/Makefile
drivers/staging/media/Kconfig
drivers/staging/media/Makefile
drivers/staging/media/deprecated/vpfe_capture/Kconfig [new file with mode: 0644]
drivers/staging/media/deprecated/vpfe_capture/Makefile [new file with mode: 0644]
drivers/staging/media/deprecated/vpfe_capture/TODO [new file with mode: 0644]
drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h [moved from drivers/media/platform/ti/davinci/ccdc_hw_device.h with 100% similarity]
drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c [moved from drivers/media/platform/ti/davinci/dm355_ccdc.c with 99% similarity]
drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h [moved from include/media/davinci/dm355_ccdc.h with 100% similarity]
drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h [moved from drivers/media/platform/ti/davinci/dm355_ccdc_regs.h with 100% similarity]
drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c [moved from drivers/media/platform/ti/davinci/dm644x_ccdc.c with 99% similarity]
drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h [moved from include/media/davinci/dm644x_ccdc.h with 100% similarity]
drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h [moved from drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h with 100% similarity]
drivers/staging/media/deprecated/vpfe_capture/isif.c [moved from drivers/media/platform/ti/davinci/isif.c with 99% similarity]
drivers/staging/media/deprecated/vpfe_capture/isif.h [moved from include/media/davinci/isif.h with 100% similarity]
drivers/staging/media/deprecated/vpfe_capture/isif_regs.h [moved from drivers/media/platform/ti/davinci/isif_regs.h with 100% similarity]
drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c [moved from drivers/media/platform/ti/davinci/vpfe_capture.c with 100% similarity]

index 2a61d11ed3e58726cc77fa6b96908c11c893b5c3..7f123e4d0f0a43236e30ac5ea616fe61b120eb83 100644 (file)
@@ -20329,6 +20329,7 @@ W:      https://linuxtv.org
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 F:     drivers/media/platform/ti/davinci/
+F:     drivers/staging/media/deprecated/vpfe_capture/
 F:     include/media/davinci/
 
 TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
index c61e697aeb12e68fb51d34c68f8d572c0fbbb1e9..96d4bed7fe9ee1da8473fae6093de20dd1dd0f87 100644 (file)
@@ -32,55 +32,6 @@ config VIDEO_DAVINCI_VPIF_CAPTURE
          To compile this driver as a module, choose M here. There will
          be two modules called vpif.ko and vpif_capture.ko
 
-config VIDEO_DM6446_CCDC
-       tristate "TI DM6446 CCDC video capture driver"
-       depends on V4L_PLATFORM_DRIVERS
-       depends on VIDEO_DEV
-       depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on I2C
-       select VIDEOBUF_DMA_CONTIG
-       help
-          Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
-          with decoder modules such as TVP5146 over BT656 or
-          sensor module such as MT9T001 over a raw interface. This
-          module configures the interface and CCDC/ISIF to do
-          video frame capture from slave decoders.
-
-          To compile this driver as a module, choose M here. There will
-          be three modules called vpfe_capture.ko, vpss.ko and dm644x_ccdc.ko
-
-config VIDEO_DM355_CCDC
-       tristate "TI DM355 CCDC video capture driver"
-       depends on V4L_PLATFORM_DRIVERS
-       depends on VIDEO_DEV
-       depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on I2C
-       select VIDEOBUF_DMA_CONTIG
-       help
-          Enables DM355 CCD hw module. DM355 CCDC hw interfaces
-          with decoder modules such as TVP5146 over BT656 or
-          sensor module such as MT9T001 over a raw interface. This
-          module configures the interface and CCDC/ISIF to do
-          video frame capture from a slave decoders
-
-          To compile this driver as a module, choose M here. There will
-          be three modules called vpfe_capture.ko, vpss.ko and dm355_ccdc.ko
-
-config VIDEO_DM365_ISIF
-       tristate "TI DM365 ISIF video capture driver"
-       depends on V4L_PLATFORM_DRIVERS
-       depends on VIDEO_DEV
-       depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on I2C
-       select VIDEOBUF_DMA_CONTIG
-       help
-          Enables ISIF hw module. This is the hardware module for
-          configuring ISIF in VPFE to capture Raw Bayer RGB data from
-          a image sensor or YUV data from a YUV source.
-
-          To compile this driver as a module, choose M here. There will
-          be three modules called vpfe_capture.ko, vpss.ko and isif.ko
-
 config VIDEO_DAVINCI_VPBE_DISPLAY
        tristate "TI DaVinci VPBE V4L2-Display driver"
        depends on V4L_PLATFORM_DRIVERS
index 05c45bf371aaeb1612a9a5e0e99f3421bfd24249..b20a91653162663a32f516722bfa85465b2090dd 100644 (file)
@@ -8,9 +8,5 @@ obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif.o vpif_display.o
 #VPIF Capture driver
 obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif.o vpif_capture.o
 
-# Capture: DM6446 and DM355
-obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o vpss.o dm644x_ccdc.o
-obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o vpss.o dm355_ccdc.o
-obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o vpss.o isif.o
 obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpss.o vpbe.o vpbe_osd.o \
        vpbe_venc.o vpbe_display.o
index 15e92b3c63424d6c818c043810f74da29d1cee91..e520241e77232d9a3d1b46944258c679ec969797 100644 (file)
@@ -60,6 +60,7 @@ source "drivers/staging/media/deprecated/fsl-viu/Kconfig"
 source "drivers/staging/media/deprecated/meye/Kconfig"
 source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
 source "drivers/staging/media/deprecated/tm6000/Kconfig"
+source "drivers/staging/media/deprecated/vpfe_capture/Kconfig"
 source "drivers/staging/media/deprecated/zr364xx/Kconfig"
 endif
 
index 10f7844b6681716230d81ef30274112553a6dbba..ad2893d34cb89ec03616d5be619e32df1a8d975e 100644 (file)
@@ -16,3 +16,4 @@ obj-$(CONFIG_VIDEO_TM6000)    += deprecated/tm6000/
 obj-$(CONFIG_VIDEO_VIU)                += deprecated/fsl-viu/
 obj-$(CONFIG_USB_ZR364XX)      += deprecated/zr364xx/
 obj-$(CONFIG_DVB_AV7110)       += av7110/
+obj-y += deprecated/vpfe_capture/
diff --git a/drivers/staging/media/deprecated/vpfe_capture/Kconfig b/drivers/staging/media/deprecated/vpfe_capture/Kconfig
new file mode 100644 (file)
index 0000000..10250e7
--- /dev/null
@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_DM6446_CCDC
+       tristate "TI DM6446 CCDC video capture driver"
+       depends on V4L_PLATFORM_DRIVERS
+       depends on VIDEO_DEV
+       depends on ARCH_DAVINCI || COMPILE_TEST
+       depends on I2C
+       select VIDEOBUF_DMA_CONTIG
+       help
+         Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
+         with decoder modules such as TVP5146 over BT656 or
+         sensor module such as MT9T001 over a raw interface. This
+         module configures the interface and CCDC/ISIF to do
+         video frame capture from slave decoders.
+
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
+         To compile this driver as a module, choose M here. There will
+         be two modules called vpfe_capture.ko and dm644x_ccdc.ko
+
+config VIDEO_DM355_CCDC
+       tristate "TI DM355 CCDC video capture driver"
+       depends on V4L_PLATFORM_DRIVERS
+       depends on VIDEO_DEV
+       depends on ARCH_DAVINCI || COMPILE_TEST
+       depends on I2C
+       select VIDEOBUF_DMA_CONTIG
+       help
+         Enables DM355 CCD hw module. DM355 CCDC hw interfaces
+         with decoder modules such as TVP5146 over BT656 or
+         sensor module such as MT9T001 over a raw interface. This
+         module configures the interface and CCDC/ISIF to do
+         video frame capture from a slave decoders
+
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
+         To compile this driver as a module, choose M here. There will
+         be two modules called vpfe_capture.ko and dm355_ccdc.ko
+
+config VIDEO_DM365_ISIF
+       tristate "TI DM365 ISIF video capture driver"
+       depends on V4L_PLATFORM_DRIVERS
+       depends on VIDEO_DEV
+       depends on ARCH_DAVINCI || COMPILE_TEST
+       depends on I2C
+       select VIDEOBUF_DMA_CONTIG
+       help
+         Enables ISIF hw module. This is the hardware module for
+         configuring ISIF in VPFE to capture Raw Bayer RGB data from
+         a image sensor or YUV data from a YUV source.
+
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
+         To compile this driver as a module, choose M here. There will
+         be two modules called vpfe_capture.ko and isif.ko
diff --git a/drivers/staging/media/deprecated/vpfe_capture/Makefile b/drivers/staging/media/deprecated/vpfe_capture/Makefile
new file mode 100644 (file)
index 0000000..609e8dc
--- /dev/null
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o dm644x_ccdc.o
+obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o dm355_ccdc.o
+obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o isif.o
diff --git a/drivers/staging/media/deprecated/vpfe_capture/TODO b/drivers/staging/media/deprecated/vpfe_capture/TODO
new file mode 100644 (file)
index 0000000..ce654d7
--- /dev/null
@@ -0,0 +1,7 @@
+These are one of the few drivers still not using the vb2
+framework, so these drivers are now deprecated with the intent of
+removing them altogether by the beginning of 2023.
+
+In order to keep these drivers they have to be converted to vb2.
+If someone is interested in doing this work, then contact the
+linux-media mailinglist (https://linuxtv.org/lists.php).
similarity index 99%
rename from drivers/media/platform/ti/davinci/dm355_ccdc.c
rename to drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c
index 8fe55d1b972cf6cba25115f7b87e104bb6cbe1f5..da8db53e9498fe4a3f2c04cc866c917ccf756d94 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 
-#include <media/davinci/dm355_ccdc.h>
+#include "dm355_ccdc.h"
 #include <media/davinci/vpss.h>
 
 #include "dm355_ccdc_regs.h"
similarity index 99%
rename from drivers/media/platform/ti/davinci/dm644x_ccdc.c
rename to drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c
index e4073e99914c077aa3b1bc5c58d547cf313b673b..4a93e5ad64153d732b35039f4689f6d0630af872 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 
-#include <media/davinci/dm644x_ccdc.h>
+#include "dm644x_ccdc.h"
 #include <media/davinci/vpss.h>
 
 #include "dm644x_ccdc_regs.h"
similarity index 99%
rename from drivers/media/platform/ti/davinci/isif.c
rename to drivers/staging/media/deprecated/vpfe_capture/isif.c
index 69e862de014fd9891b702f84e28c007277e71fdc..4059891c28240bb8002aac00fe0056bb19f12672 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 
-#include <media/davinci/isif.h>
+#include "isif.h"
 #include <media/davinci/vpss.h>
 
 #include "isif_regs.h"