Commit 7120d6bf authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: tm6000: remove deprecated driver 



The tm6000 driver does not use the vb2 framework for streaming
video, instead it uses the old vb1 framework and nobody stepped in to
convert this driver to vb2.

The hardware is very old, so the decision was made to remove it
altogether since we want to get rid of the old vb1 framework.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent d2a8e92f

Documentation/admin-guide/media/tm6000-cardlist.rst

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



TM6000 cards list

=================



.. tabularcolumns:: |p{1.4cm}|p{11.1cm}|p{4.2cm}|



.. flat-table::

   :header-rows: 1

   :widths: 2 19 18

   :stub-columns: 0



   * - Card number

     - Card name

     - USB IDs



   * - 0

     - Unknown tm6000 video grabber

     -



   * - 1

     - Generic tm5600 board

     - 6000:0001



   * - 2

     - Generic tm6000 board

     -



   * - 3

     - Generic tm6010 board

     - 6000:0002



   * - 4

     - 10Moons UT 821

     -



   * - 5

     - 10Moons UT 330

     -



   * - 6

     - ADSTECH Dual TV USB

     - 06e1:f332



   * - 7

     - Freecom Hybrid Stick / Moka DVB-T Receiver Dual

     - 14aa:0620



   * - 8

     - ADSTECH Mini Dual TV USB

     - 06e1:b339



   * - 9

     - Hauppauge WinTV HVR-900H / WinTV USB2-Stick

     - 2040:6600, 2040:6601, 2040:6610, 2040:6611



   * - 10

     - Beholder Wander DVB-T/TV/FM USB2.0

     - 6000:dec0



   * - 11

     - Beholder Voyager TV/FM USB2.0

     - 6000:dec1



   * - 12

     - Terratec Cinergy Hybrid XE / Cinergy Hybrid-Stick

     - 0ccd:0086, 0ccd:00A5



   * - 13

     - Twinhan TU501(704D1)

     - 13d3:3240, 13d3:3241, 13d3:3243, 13d3:3264



   * - 14

     - Beholder Wander Lite DVB-T/TV/FM USB2.0

     - 6000:dec2



   * - 15

     - Beholder Voyager Lite TV/FM USB2.0

     - 6000:dec3



   * - 16

     - Terratec Grabster AV 150/250 MX

     - 0ccd:0079

Documentation/admin-guide/media/usb-cardlist.rst

+0 −4
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ pwc USB Philips Cameras 
s2250                   Sensoray 2250/2251

s2255drv                USB Sensoray 2255 video capture device

smsusb                  Siano SMS1xxx based MDTV receiver

tm6000-alsa             TV Master TM5600/6000/6010 audio

tm6000-dvb              DVB Support for tm6000 based TV cards

tm6000                  TV Master TM5600/6000/6010 driver

ttusb_dec               Technotrend/Hauppauge USB DEC devices

usbtv                   USBTV007 video capture

uvcvideo                USB Video Class (UVC)
@@ -107,7 +104,6 @@ zd1301 ZyDAS ZD1301 
	au0828-cardlist

	cx231xx-cardlist

	em28xx-cardlist

	tm6000-cardlist

	siano-cardlist



	gspca-cardlist

MAINTAINERS

+0 −9
Original line number Diff line number Diff line
@@ -20976,15 +20976,6 @@ W: http://sourceforge.net/projects/tlan/ 
F:	Documentation/networking/device_drivers/ethernet/ti/tlan.rst

F:	drivers/net/ethernet/ti/tlan.*









TM6000 VIDEO4LINUX DRIVER









M:	Mauro Carvalho Chehab <mchehab@kernel.org>









L:	linux-media@vger.kernel.org









S:	Odd fixes









W:	https://linuxtv.org









T:	git git://linuxtv.org/media_tree.git









F:	Documentation/admin-guide/media/tm6000*









F:	drivers/staging/media/deprecated/tm6000/

















TMIO/SDHI MMC DRIVER









M:	Wolfram Sang <wsa+renesas@sang-engineering.com>









L:	linux-mmc@vger.kernel.org

























drivers/staging/media/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -53,7 +53,6 @@ menuconfig STAGING_MEDIA_DEPRECATED







if STAGING_MEDIA_DEPRECATED









source "drivers/staging/media/deprecated/atmel/Kconfig"









source "drivers/staging/media/deprecated/saa7146/Kconfig"









source "drivers/staging/media/deprecated/tm6000/Kconfig"









endif



















endif
























drivers/staging/media/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -9,5 +9,4 @@ obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC)	+= rkvdec/







obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/









obj-$(CONFIG_VIDEO_TEGRA)	+= tegra-video/









obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/









obj-$(CONFIG_VIDEO_TM6000)	+= deprecated/tm6000/









obj-y += deprecated/saa7146/