* [RFC PATCH 0/3] cpia2/zr364xx/usbvision: move to staging
@ 2018-05-13 11:05 Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 1/3] cpia2: move to staging in preparation for removal Hans Verkuil
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Hans Verkuil @ 2018-05-13 11:05 UTC (permalink / raw)
To: linux-media
From: Hans Verkuil <hans.verkuil@cisco.com>
Since we're going to deprecate the zoran driver (and remove it in a
year), I thought that this is a good time to look at some other
drivers that 1) do not use the proper frameworks (vb2!) and 2) are
for ancient hardware for which there are easily available working
alternatives.
This patch series proposes to move the following drivers to staging:
- cpia2: used in old USB microscopes. The last real change was in
April 2012 by me.
- zr364xx: used in (very!) old digital cameras. The last real change
was in June 2012 by me.
- usbvision: old TV capture device. Never worked very well. The last
changes where for a bug report in end 2015/early 2016 and many
fixed/improvements from me in July 2015.
The cpia2 and usbvision have their own streaming implementation,
the zr364xx uses vb1.
I don't think it is likely that anyone is willing to convert these
drivers to vb2.
Regards,
Hans
Hans Verkuil (3):
cpia2: move to staging in preparation for removal
zr364xx: move to staging in preparation for removal
usbvision: move to staging in preparation for removal
MAINTAINERS | 4 ++--
drivers/media/usb/Kconfig | 3 ---
drivers/media/usb/Makefile | 4 +---
drivers/staging/media/Kconfig | 6 ++++++
drivers/staging/media/Makefile | 3 +++
drivers/{media/usb => staging/media}/cpia2/Kconfig | 2 +-
drivers/{media/usb => staging/media}/cpia2/Makefile | 0
drivers/staging/media/cpia2/TODO | 4 ++++
drivers/{media/usb => staging/media}/cpia2/cpia2.h | 0
drivers/{media/usb => staging/media}/cpia2/cpia2_core.c | 0
.../{media/usb => staging/media}/cpia2/cpia2_registers.h | 0
drivers/{media/usb => staging/media}/cpia2/cpia2_usb.c | 0
drivers/{media/usb => staging/media}/cpia2/cpia2_v4l.c | 0
drivers/{media/usb => staging/media}/usbvision/Kconfig | 2 +-
drivers/{media/usb => staging/media}/usbvision/Makefile | 0
drivers/staging/media/usbvision/TODO | 4 ++++
.../usb => staging/media}/usbvision/usbvision-cards.c | 0
.../usb => staging/media}/usbvision/usbvision-cards.h | 0
.../{media/usb => staging/media}/usbvision/usbvision-core.c | 0
.../{media/usb => staging/media}/usbvision/usbvision-i2c.c | 0
.../usb => staging/media}/usbvision/usbvision-video.c | 0
drivers/{media/usb => staging/media}/usbvision/usbvision.h | 0
drivers/{media/usb => staging/media}/zr364xx/Kconfig | 0
drivers/{media/usb => staging/media}/zr364xx/Makefile | 0
drivers/staging/media/zr364xx/TODO | 4 ++++
drivers/{media/usb => staging/media}/zr364xx/zr364xx.c | 0
26 files changed, 26 insertions(+), 10 deletions(-)
rename drivers/{media/usb => staging/media}/cpia2/Kconfig (87%)
rename drivers/{media/usb => staging/media}/cpia2/Makefile (100%)
create mode 100644 drivers/staging/media/cpia2/TODO
rename drivers/{media/usb => staging/media}/cpia2/cpia2.h (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_core.c (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_registers.h (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_usb.c (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_v4l.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/Kconfig (82%)
rename drivers/{media/usb => staging/media}/usbvision/Makefile (100%)
create mode 100644 drivers/staging/media/usbvision/TODO
rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.h (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-core.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-i2c.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-video.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision.h (100%)
rename drivers/{media/usb => staging/media}/zr364xx/Kconfig (100%)
rename drivers/{media/usb => staging/media}/zr364xx/Makefile (100%)
create mode 100644 drivers/staging/media/zr364xx/TODO
rename drivers/{media/usb => staging/media}/zr364xx/zr364xx.c (100%)
--
2.17.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC PATCH 1/3] cpia2: move to staging in preparation for removal
2018-05-13 11:05 [RFC PATCH 0/3] cpia2/zr364xx/usbvision: move to staging Hans Verkuil
@ 2018-05-13 11:05 ` Hans Verkuil
2018-09-28 13:03 ` [RFC,1/3] " Andrea Merello
2018-05-13 11:05 ` [RFC PATCH 2/3] zr364xx: " Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 3/3] usbvision: " Hans Verkuil
2 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2018-05-13 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
This driver hasn't been tested in a long, long time. The hardware is
ancient and pretty much obsolete. This driver also needs to be converted
to newer media frameworks (vb2!) but due to the lack of time and interest
that is unlikely to happen.
So this driver is a prime candidate for removal. If someone is interested
in working on this driver to prevent its removal, then please contact the
linux-media mailinglist.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/usb/Kconfig | 1 -
drivers/media/usb/Makefile | 1 -
drivers/staging/media/Kconfig | 2 ++
drivers/staging/media/Makefile | 1 +
drivers/{media/usb => staging/media}/cpia2/Kconfig | 2 +-
drivers/{media/usb => staging/media}/cpia2/Makefile | 0
drivers/staging/media/cpia2/TODO | 4 ++++
drivers/{media/usb => staging/media}/cpia2/cpia2.h | 0
drivers/{media/usb => staging/media}/cpia2/cpia2_core.c | 0
drivers/{media/usb => staging/media}/cpia2/cpia2_registers.h | 0
drivers/{media/usb => staging/media}/cpia2/cpia2_usb.c | 0
drivers/{media/usb => staging/media}/cpia2/cpia2_v4l.c | 0
12 files changed, 8 insertions(+), 3 deletions(-)
rename drivers/{media/usb => staging/media}/cpia2/Kconfig (87%)
rename drivers/{media/usb => staging/media}/cpia2/Makefile (100%)
create mode 100644 drivers/staging/media/cpia2/TODO
rename drivers/{media/usb => staging/media}/cpia2/cpia2.h (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_core.c (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_registers.h (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_usb.c (100%)
rename drivers/{media/usb => staging/media}/cpia2/cpia2_v4l.c (100%)
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index b24e753c4766..7c4058b67008 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -13,7 +13,6 @@ if MEDIA_CAMERA_SUPPORT
source "drivers/media/usb/uvc/Kconfig"
source "drivers/media/usb/gspca/Kconfig"
source "drivers/media/usb/pwc/Kconfig"
-source "drivers/media/usb/cpia2/Kconfig"
source "drivers/media/usb/zr364xx/Kconfig"
source "drivers/media/usb/stkwebcam/Kconfig"
source "drivers/media/usb/s2255/Kconfig"
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 21e46b10caa5..356b1103a0aa 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_USB_PWC) += pwc/
obj-$(CONFIG_USB_AIRSPY) += airspy/
obj-$(CONFIG_USB_HACKRF) += hackrf/
obj-$(CONFIG_USB_MSI2500) += msi2500/
-obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
obj-$(CONFIG_VIDEO_AU0828) += au0828/
obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 4c495a10025c..68b9084d3476 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -23,6 +23,8 @@ source "drivers/staging/media/atomisp/Kconfig"
source "drivers/staging/media/bcm2048/Kconfig"
+source "drivers/staging/media/cpia2/Kconfig"
+
source "drivers/staging/media/davinci_vpfe/Kconfig"
source "drivers/staging/media/imx/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 61a5765cb98f..f1566ac9a6c0 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
+obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074/
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031/
diff --git a/drivers/media/usb/cpia2/Kconfig b/drivers/staging/media/cpia2/Kconfig
similarity index 87%
rename from drivers/media/usb/cpia2/Kconfig
rename to drivers/staging/media/cpia2/Kconfig
index 66e9283f5993..805670826281 100644
--- a/drivers/media/usb/cpia2/Kconfig
+++ b/drivers/staging/media/cpia2/Kconfig
@@ -1,5 +1,5 @@
config VIDEO_CPIA2
- tristate "CPiA2 Video For Linux"
+ tristate "CPiA2 Video For Linux (Deprecated)"
depends on VIDEO_DEV && USB && VIDEO_V4L2
---help---
This is the video4linux driver for cameras based on Vision's CPiA2
diff --git a/drivers/media/usb/cpia2/Makefile b/drivers/staging/media/cpia2/Makefile
similarity index 100%
rename from drivers/media/usb/cpia2/Makefile
rename to drivers/staging/media/cpia2/Makefile
diff --git a/drivers/staging/media/cpia2/TODO b/drivers/staging/media/cpia2/TODO
new file mode 100644
index 000000000000..4a4dff2073cd
--- /dev/null
+++ b/drivers/staging/media/cpia2/TODO
@@ -0,0 +1,4 @@
+The cpia2 driver is marked deprecated. It will be removed
+around May 2019 unless someone is willing to update this
+driver to the latest V4L2 frameworks (especially the vb2
+framework).
diff --git a/drivers/media/usb/cpia2/cpia2.h b/drivers/staging/media/cpia2/cpia2.h
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2.h
rename to drivers/staging/media/cpia2/cpia2.h
diff --git a/drivers/media/usb/cpia2/cpia2_core.c b/drivers/staging/media/cpia2/cpia2_core.c
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_core.c
rename to drivers/staging/media/cpia2/cpia2_core.c
diff --git a/drivers/media/usb/cpia2/cpia2_registers.h b/drivers/staging/media/cpia2/cpia2_registers.h
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_registers.h
rename to drivers/staging/media/cpia2/cpia2_registers.h
diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/staging/media/cpia2/cpia2_usb.c
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_usb.c
rename to drivers/staging/media/cpia2/cpia2_usb.c
diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/staging/media/cpia2/cpia2_v4l.c
similarity index 100%
rename from drivers/media/usb/cpia2/cpia2_v4l.c
rename to drivers/staging/media/cpia2/cpia2_v4l.c
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RFC PATCH 2/3] zr364xx: move to staging in preparation for removal
2018-05-13 11:05 [RFC PATCH 0/3] cpia2/zr364xx/usbvision: move to staging Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 1/3] cpia2: move to staging in preparation for removal Hans Verkuil
@ 2018-05-13 11:05 ` Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 3/3] usbvision: " Hans Verkuil
2 siblings, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2018-05-13 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
This driver hasn't been tested in a long, long time. The hardware is
ancient and pretty much obsolete. This driver also needs to be converted
to newer media frameworks (vb2!) but due to the lack of time and interest
that is unlikely to happen.
So this driver is a prime candidate for removal. If someone is interested
in working on this driver to prevent its removal, then please contact the
linux-media mailinglist.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
MAINTAINERS | 2 +-
drivers/media/usb/Kconfig | 1 -
drivers/media/usb/Makefile | 2 +-
drivers/staging/media/Kconfig | 2 ++
drivers/staging/media/Makefile | 1 +
drivers/{media/usb => staging/media}/zr364xx/Kconfig | 0
drivers/{media/usb => staging/media}/zr364xx/Makefile | 0
drivers/staging/media/zr364xx/TODO | 4 ++++
drivers/{media/usb => staging/media}/zr364xx/zr364xx.c | 0
9 files changed, 9 insertions(+), 3 deletions(-)
rename drivers/{media/usb => staging/media}/zr364xx/Kconfig (100%)
rename drivers/{media/usb => staging/media}/zr364xx/Makefile (100%)
create mode 100644 drivers/staging/media/zr364xx/TODO
rename drivers/{media/usb => staging/media}/zr364xx/zr364xx.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 49003f77cedd..5e5628519799 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14803,7 +14803,7 @@ T: git git://linuxtv.org/media_tree.git
W: http://royale.zerezo.com/zr364xx/
S: Maintained
F: Documentation/media/v4l-drivers/zr364xx*
-F: drivers/media/usb/zr364xx/
+F: drivers/staging/media/zr364xx/
USER-MODE LINUX (UML)
M: Jeff Dike <jdike@addtoit.com>
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 7c4058b67008..3335981f33e1 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -13,7 +13,6 @@ if MEDIA_CAMERA_SUPPORT
source "drivers/media/usb/uvc/Kconfig"
source "drivers/media/usb/gspca/Kconfig"
source "drivers/media/usb/pwc/Kconfig"
-source "drivers/media/usb/zr364xx/Kconfig"
source "drivers/media/usb/stkwebcam/Kconfig"
source "drivers/media/usb/s2255/Kconfig"
source "drivers/media/usb/usbtv/Kconfig"
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 356b1103a0aa..014f83d445e3 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -5,7 +5,7 @@
# DVB USB-only drivers
obj-y += ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/
-obj-y += zr364xx/ stkwebcam/ s2255/
+obj-y += stkwebcam/ s2255/
obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
obj-$(CONFIG_USB_GSPCA) += gspca/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 68b9084d3476..00d14e735cd4 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -37,4 +37,6 @@ source "drivers/staging/media/omap4iss/Kconfig"
source "drivers/staging/media/tegra-vde/Kconfig"
+source "drivers/staging/media/zr364xx/Kconfig"
+
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index f1566ac9a6c0..4d6d90aaf607 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
obj-$(CONFIG_INTEL_ATOMISP) += atomisp/
obj-$(CONFIG_TEGRA_VDE) += tegra-vde/
+obj-$(CONFIG_USB_ZR364XX) += zr364xx/
diff --git a/drivers/media/usb/zr364xx/Kconfig b/drivers/staging/media/zr364xx/Kconfig
similarity index 100%
rename from drivers/media/usb/zr364xx/Kconfig
rename to drivers/staging/media/zr364xx/Kconfig
diff --git a/drivers/media/usb/zr364xx/Makefile b/drivers/staging/media/zr364xx/Makefile
similarity index 100%
rename from drivers/media/usb/zr364xx/Makefile
rename to drivers/staging/media/zr364xx/Makefile
diff --git a/drivers/staging/media/zr364xx/TODO b/drivers/staging/media/zr364xx/TODO
new file mode 100644
index 000000000000..8a9a6c275e78
--- /dev/null
+++ b/drivers/staging/media/zr364xx/TODO
@@ -0,0 +1,4 @@
+The zr364xx driver is marked deprecated. It will be removed
+around May 2019 unless someone is willing to update this
+driver to the latest V4L2 frameworks (especially the vb2
+framework).
diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/staging/media/zr364xx/zr364xx.c
similarity index 100%
rename from drivers/media/usb/zr364xx/zr364xx.c
rename to drivers/staging/media/zr364xx/zr364xx.c
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RFC PATCH 3/3] usbvision: move to staging in preparation for removal
2018-05-13 11:05 [RFC PATCH 0/3] cpia2/zr364xx/usbvision: move to staging Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 1/3] cpia2: move to staging in preparation for removal Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 2/3] zr364xx: " Hans Verkuil
@ 2018-05-13 11:05 ` Hans Verkuil
2 siblings, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2018-05-13 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
This driver hasn't been tested in a long, long time. The hardware is
ancient and pretty much obsolete. This driver also needs to be converted
to newer media frameworks (vb2!) but due to the lack of time and interest
that is unlikely to happen.
So this driver is a prime candidate for removal. If someone is interested
in working on this driver to prevent its removal, then please contact the
linux-media mailinglist.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
MAINTAINERS | 2 +-
drivers/media/usb/Kconfig | 1 -
drivers/media/usb/Makefile | 1 -
drivers/staging/media/Kconfig | 2 ++
drivers/staging/media/Makefile | 1 +
drivers/{media/usb => staging/media}/usbvision/Kconfig | 2 +-
drivers/{media/usb => staging/media}/usbvision/Makefile | 0
drivers/staging/media/usbvision/TODO | 4 ++++
.../{media/usb => staging/media}/usbvision/usbvision-cards.c | 0
.../{media/usb => staging/media}/usbvision/usbvision-cards.h | 0
.../{media/usb => staging/media}/usbvision/usbvision-core.c | 0
.../{media/usb => staging/media}/usbvision/usbvision-i2c.c | 0
.../{media/usb => staging/media}/usbvision/usbvision-video.c | 0
drivers/{media/usb => staging/media}/usbvision/usbvision.h | 0
14 files changed, 9 insertions(+), 4 deletions(-)
rename drivers/{media/usb => staging/media}/usbvision/Kconfig (82%)
rename drivers/{media/usb => staging/media}/usbvision/Makefile (100%)
create mode 100644 drivers/staging/media/usbvision/TODO
rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.h (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-core.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-i2c.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision-video.c (100%)
rename drivers/{media/usb => staging/media}/usbvision/usbvision.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5e5628519799..8cd175777316 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14767,7 +14767,7 @@ L: linux-media@vger.kernel.org
T: git git://linuxtv.org/media_tree.git
W: https://linuxtv.org
S: Odd Fixes
-F: drivers/media/usb/usbvision/
+F: drivers/staging/media/usbvision/
USB WEBCAM GADGET
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 3335981f33e1..f5de4846e12d 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -22,7 +22,6 @@ if MEDIA_ANALOG_TV_SUPPORT
comment "Analog TV USB devices"
source "drivers/media/usb/pvrusb2/Kconfig"
source "drivers/media/usb/hdpvr/Kconfig"
-source "drivers/media/usb/usbvision/Kconfig"
source "drivers/media/usb/stk1160/Kconfig"
source "drivers/media/usb/go7007/Kconfig"
endif
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 014f83d445e3..c13d72ec53f2 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_USB_MSI2500) += msi2500/
obj-$(CONFIG_VIDEO_AU0828) += au0828/
obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
-obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
obj-$(CONFIG_VIDEO_STK1160) += stk1160/
obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
obj-$(CONFIG_VIDEO_TM6000) += tm6000/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 00d14e735cd4..c48b3bff7de9 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -37,6 +37,8 @@ source "drivers/staging/media/omap4iss/Kconfig"
source "drivers/staging/media/tegra-vde/Kconfig"
+source "drivers/staging/media/usbvision/Kconfig"
+
source "drivers/staging/media/zr364xx/Kconfig"
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 4d6d90aaf607..e54cef574b1e 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -8,4 +8,5 @@ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
obj-$(CONFIG_INTEL_ATOMISP) += atomisp/
obj-$(CONFIG_TEGRA_VDE) += tegra-vde/
+obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
obj-$(CONFIG_USB_ZR364XX) += zr364xx/
diff --git a/drivers/media/usb/usbvision/Kconfig b/drivers/staging/media/usbvision/Kconfig
similarity index 82%
rename from drivers/media/usb/usbvision/Kconfig
rename to drivers/staging/media/usbvision/Kconfig
index 6b6afc5d8f7e..1c7290356e70 100644
--- a/drivers/media/usb/usbvision/Kconfig
+++ b/drivers/staging/media/usbvision/Kconfig
@@ -1,5 +1,5 @@
config VIDEO_USBVISION
- tristate "USB video devices based on Nogatech NT1003/1004/1005"
+ tristate "USB video devices based on Nogatech NT1003/1004/1005 (Deprecated)"
depends on I2C && VIDEO_V4L2
select VIDEO_TUNER
select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/usb/usbvision/Makefile b/drivers/staging/media/usbvision/Makefile
similarity index 100%
rename from drivers/media/usb/usbvision/Makefile
rename to drivers/staging/media/usbvision/Makefile
diff --git a/drivers/staging/media/usbvision/TODO b/drivers/staging/media/usbvision/TODO
new file mode 100644
index 000000000000..1fe53ceb9ce2
--- /dev/null
+++ b/drivers/staging/media/usbvision/TODO
@@ -0,0 +1,4 @@
+The usbvision driver is marked deprecated. It will be removed
+around May 2019 unless someone is willing to update this
+driver to the latest V4L2 frameworks (especially the vb2
+framework).
diff --git a/drivers/media/usb/usbvision/usbvision-cards.c b/drivers/staging/media/usbvision/usbvision-cards.c
similarity index 100%
rename from drivers/media/usb/usbvision/usbvision-cards.c
rename to drivers/staging/media/usbvision/usbvision-cards.c
diff --git a/drivers/media/usb/usbvision/usbvision-cards.h b/drivers/staging/media/usbvision/usbvision-cards.h
similarity index 100%
rename from drivers/media/usb/usbvision/usbvision-cards.h
rename to drivers/staging/media/usbvision/usbvision-cards.h
diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/staging/media/usbvision/usbvision-core.c
similarity index 100%
rename from drivers/media/usb/usbvision/usbvision-core.c
rename to drivers/staging/media/usbvision/usbvision-core.c
diff --git a/drivers/media/usb/usbvision/usbvision-i2c.c b/drivers/staging/media/usbvision/usbvision-i2c.c
similarity index 100%
rename from drivers/media/usb/usbvision/usbvision-i2c.c
rename to drivers/staging/media/usbvision/usbvision-i2c.c
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/staging/media/usbvision/usbvision-video.c
similarity index 100%
rename from drivers/media/usb/usbvision/usbvision-video.c
rename to drivers/staging/media/usbvision/usbvision-video.c
diff --git a/drivers/media/usb/usbvision/usbvision.h b/drivers/staging/media/usbvision/usbvision.h
similarity index 100%
rename from drivers/media/usb/usbvision/usbvision.h
rename to drivers/staging/media/usbvision/usbvision.h
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RFC,1/3] cpia2: move to staging in preparation for removal
2018-05-13 11:05 ` [RFC PATCH 1/3] cpia2: move to staging in preparation for removal Hans Verkuil
@ 2018-09-28 13:03 ` Andrea Merello
2018-09-28 13:35 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Andrea Merello @ 2018-09-28 13:03 UTC (permalink / raw)
To: linux-media, hans.verkuil; +Cc: Andrea Merello
I do often use this driver, and I'm interested in working on it for preventing it from being removed.
I can perform functional test with my HW (usb microscope) on a kernel from current media tree (anyway currently it works on my box with a pretty recent kernel).
How much effort is expected to be required to port it to vb2? I'm currently hacking on another (recent) v4l2 subdev driver, but my wknowledge of the v4l2/media framework is far from good.. If someone give me some directions then I can try to do that..
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC,1/3] cpia2: move to staging in preparation for removal
2018-09-28 13:03 ` [RFC,1/3] " Andrea Merello
@ 2018-09-28 13:35 ` Hans Verkuil
0 siblings, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2018-09-28 13:35 UTC (permalink / raw)
To: Andrea Merello, linux-media
Hi Andrea,
On 09/28/2018 03:03 PM, Andrea Merello wrote:
> I do often use this driver, and I'm interested in working on it for preventing it from being removed.
>
> I can perform functional test with my HW (usb microscope) on a kernel from current media tree (anyway currently it works on my box with a pretty recent kernel).
>
> How much effort is expected to be required to port it to vb2? I'm currently hacking on another (recent) v4l2 subdev driver, but my wknowledge of the v4l2/media framework is far from good.. If someone give me some directions then I can try to do that..
>
cpia2 has its own streaming I/O implementation. This should be completely replaced
by vb2. Easiest is to look at a fairly recent usb driver like usbtv to see how
it is done there.
The vb2 API is fairly clean (see include/media/videobuf2-core.h), but switching to
vb2 is a big-bang action, you can't switch a little bit, it is all or nothing.
So that makes this a big unreadable patch in the end. The v4l2-compliance utility
is your friend when testing this.
If you would be willing to work on this, then it's easiest if you use the #v4l channel
on freenode irc to ask questions (which I am sure you'll have).
It's a fair amount of work, I'm afraid. It would probably take me 1-2 days to convert
depending on how nice the rest of the cpia2 driver is.
Regards,
Hans
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-09-28 19:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-13 11:05 [RFC PATCH 0/3] cpia2/zr364xx/usbvision: move to staging Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 1/3] cpia2: move to staging in preparation for removal Hans Verkuil
2018-09-28 13:03 ` [RFC,1/3] " Andrea Merello
2018-09-28 13:35 ` Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 2/3] zr364xx: " Hans Verkuil
2018-05-13 11:05 ` [RFC PATCH 3/3] usbvision: " Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox