diff options
author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2022-05-18 12:20:43 +0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-06-20 12:30:31 +0300 |
commit | 56280c64ecacc971734fad4618b33061fc40b6d7 (patch) | |
tree | bc935ca9c74c7341e15368ee4864fa3f64467acd | |
parent | aa911fcc772e38441f3331ccf442ada898ccbf8c (diff) | |
download | linux-56280c64ecacc971734fad4618b33061fc40b6d7.tar.xz |
media: stkwebcam: deprecate driver, move to staging
This is a very old driver for very old hardware and it is one of
the very few remaining that does not use the vb2 framework (or
even the older videobuf framework), so deprecate this driver
and move it to staging with the intent to removing it altogether
by the end of 2022.
If someone wants to keep this driver, then it has to be converted
to use vb2.
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-rw-r--r-- | drivers/media/usb/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/usb/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/media/Kconfig | 12 | ||||
-rw-r--r-- | drivers/staging/media/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/media/stkwebcam/Kconfig (renamed from drivers/media/usb/stkwebcam/Kconfig) | 8 | ||||
-rw-r--r-- | drivers/staging/media/stkwebcam/Makefile (renamed from drivers/media/usb/stkwebcam/Makefile) | 2 | ||||
-rw-r--r-- | drivers/staging/media/stkwebcam/TODO | 12 | ||||
-rw-r--r-- | drivers/staging/media/stkwebcam/stk-sensor.c (renamed from drivers/media/usb/stkwebcam/stk-sensor.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/stkwebcam/stk-webcam.c (renamed from drivers/media/usb/stkwebcam/stk-webcam.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/stkwebcam/stk-webcam.h (renamed from drivers/media/usb/stkwebcam/stk-webcam.h) | 0 |
10 files changed, 27 insertions, 10 deletions
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index 8de08704f8e4..af88e0766388 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -17,7 +17,6 @@ source "drivers/media/usb/cpia2/Kconfig" source "drivers/media/usb/gspca/Kconfig" source "drivers/media/usb/pwc/Kconfig" source "drivers/media/usb/s2255/Kconfig" -source "drivers/media/usb/stkwebcam/Kconfig" source "drivers/media/usb/usbtv/Kconfig" source "drivers/media/usb/uvc/Kconfig" source "drivers/media/usb/zr364xx/Kconfig" diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 044bd46c799c..25fa2015b179 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile @@ -10,7 +10,6 @@ obj-y += dvb-usb/ obj-y += dvb-usb-v2/ obj-y += s2255/ obj-y += siano/ -obj-y += stkwebcam/ obj-y += ttusb-budget/ obj-y += ttusb-dec/ obj-y += zr364xx/ diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 1fd6a0c6e1d8..421ce9dbf44c 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -22,10 +22,14 @@ if STAGING_MEDIA && MEDIA_SUPPORT # Please keep them in alphabetic order source "drivers/staging/media/atomisp/Kconfig" +source "drivers/staging/media/av7110/Kconfig" + source "drivers/staging/media/hantro/Kconfig" source "drivers/staging/media/imx/Kconfig" +source "drivers/staging/media/ipu3/Kconfig" + source "drivers/staging/media/max96712/Kconfig" source "drivers/staging/media/meson/vdec/Kconfig" @@ -34,14 +38,12 @@ source "drivers/staging/media/omap4iss/Kconfig" source "drivers/staging/media/rkvdec/Kconfig" -source "drivers/staging/media/sunxi/Kconfig" +source "drivers/staging/media/stkwebcam/Kconfig" -source "drivers/staging/media/zoran/Kconfig" +source "drivers/staging/media/sunxi/Kconfig" source "drivers/staging/media/tegra-video/Kconfig" -source "drivers/staging/media/ipu3/Kconfig" - -source "drivers/staging/media/av7110/Kconfig" +source "drivers/staging/media/zoran/Kconfig" endif diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 66d6f6d51c86..950e96f10aad 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_VIDEO_MAX96712) += max96712/ obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/ +obj-$(CONFIG_VIDEO_STKWEBCAM) += stkwebcam/ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/ obj-$(CONFIG_VIDEO_HANTRO) += hantro/ diff --git a/drivers/media/usb/stkwebcam/Kconfig b/drivers/staging/media/stkwebcam/Kconfig index d94d023f1aa0..4450403dff41 100644 --- a/drivers/media/usb/stkwebcam/Kconfig +++ b/drivers/staging/media/stkwebcam/Kconfig @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only -config USB_STKWEBCAM - tristate "USB Syntek DC1125 Camera support" +config VIDEO_STKWEBCAM + tristate "USB Syntek DC1125 Camera support (DEPRECATED)" depends on VIDEO_DEV + depends on USB help Say Y here if you want to use this type of camera. Supported devices are typically found in some Asus laptops, @@ -9,6 +10,9 @@ config USB_STKWEBCAM may be supported by the stk11xx driver, from which this is derived, see <http://sourceforge.net/projects/syntekdriver/> + This driver is deprecated and is scheduled for removal by + the end of 2022. See the TODO file for more information. + To compile this driver as a module, choose M here: the module will be called stkwebcam. diff --git a/drivers/media/usb/stkwebcam/Makefile b/drivers/staging/media/stkwebcam/Makefile index daa9ae6d48c2..17ad7b6f43d0 100644 --- a/drivers/media/usb/stkwebcam/Makefile +++ b/drivers/staging/media/stkwebcam/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only stkwebcam-objs := stk-webcam.o stk-sensor.o -obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o +obj-$(CONFIG_VIDEO_STKWEBCAM) += stkwebcam.o diff --git a/drivers/staging/media/stkwebcam/TODO b/drivers/staging/media/stkwebcam/TODO new file mode 100644 index 000000000000..735304a72729 --- /dev/null +++ b/drivers/staging/media/stkwebcam/TODO @@ -0,0 +1,12 @@ +This is a very old driver for very old hardware (specifically +laptops that use this sensor). In addition according to reports +the picture quality is quite bad. + +This is also one of the few drivers still not using the vb2 +framework (or even the old videobuf framework!), so this driver +is now deprecated with the intent of removing it altogether by +the end of 2022. + +In order to keep this driver it has to be converted to vb2. +If someone is interested in doing this work, then contact the +linux-media mailinglist (https://linuxtv.org/lists.php). diff --git a/drivers/media/usb/stkwebcam/stk-sensor.c b/drivers/staging/media/stkwebcam/stk-sensor.c index 94aa6a27f934..94aa6a27f934 100644 --- a/drivers/media/usb/stkwebcam/stk-sensor.c +++ b/drivers/staging/media/stkwebcam/stk-sensor.c diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/staging/media/stkwebcam/stk-webcam.c index 787edb3d47c2..787edb3d47c2 100644 --- a/drivers/media/usb/stkwebcam/stk-webcam.c +++ b/drivers/staging/media/stkwebcam/stk-webcam.c diff --git a/drivers/media/usb/stkwebcam/stk-webcam.h b/drivers/staging/media/stkwebcam/stk-webcam.h index 136decffe9ce..136decffe9ce 100644 --- a/drivers/media/usb/stkwebcam/stk-webcam.h +++ b/drivers/staging/media/stkwebcam/stk-webcam.h |