diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-14 09:42:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-14 09:42:41 -0300 |
| commit | fe1b63559744f62262a57748763586b4a97bed3b (patch) | |
| tree | f700384269c79146443cb9cc4e2ccc8c3a7276c6 /v4l | |
| parent | 7267a608e1c1c223a1977377ddb57367d97eb737 (diff) | |
| download | mediapointer-dvb-s2-fe1b63559744f62262a57748763586b4a97bed3b.tar.gz mediapointer-dvb-s2-fe1b63559744f62262a57748763586b4a97bed3b.tar.bz2 | |
Add tm6000 and tuner-xc2028 drivers
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Adds a V4L driver for Trident TV Master TM5600/TM6000 chips.
Those USB devices are usually found with a Xceive XC2028/XC3028
tuner, although the firmware seems to be modified to work with
those chips.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Kconfig.staging | 23 | ||||
| -rw-r--r-- | v4l/Makefile.staging | 10 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 1 | ||||
| -rw-r--r-- | v4l/versions.txt | 3 |
4 files changed, 33 insertions, 4 deletions
diff --git a/v4l/Kconfig.staging b/v4l/Kconfig.staging index 45bfeb002..da0a041af 100644 --- a/v4l/Kconfig.staging +++ b/v4l/Kconfig.staging @@ -21,10 +21,16 @@ menuconfig STAGING If in doubt, say N here. - if STAGING menu "Media devices in staging" +config STAGING_BROKEN + bool "Enable drivers that are known to not compile" + default n + --- help --- + Say N here, except if you will be fixing the drivers + compilation. + config VIDEO_GO7007 tristate "Go 7007 support" depends on VIDEO_DEV && PCI && I2C && INPUT @@ -96,6 +102,21 @@ config VIDEO_CX25821_ALSA To compile this driver as a module, choose M here: the module will be called cx25821-alsa. +config VIDEO_TM6000 + tristate "TV Master TM5600/6000 driver" + select VIDEO_V4L2 + select TUNER_XC2028 + select VIDEO_USB_ISOC + select VIDEOBUF_VMALLOC + depends on STAGING_BROKEN + help + Support for TM5600/TM6000 USB Device + + Since these cards have no MPEG decoder onboard, they transmit + only compressed MPEG data over the usb bus, so you need + an external software decoder to watch TV on your computer. + + Say Y if you own such a device and want to use it. endmenu diff --git a/v4l/Makefile.staging b/v4l/Makefile.staging index 77ba6a9fa..0c60fbb1a 100644 --- a/v4l/Makefile.staging +++ b/v4l/Makefile.staging @@ -51,8 +51,14 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821.o obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o EXTRA_CFLAGS += -Idrivers/media/video -EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core -EXTRA_CFLAGS += -Idrivers/media/dvb/frontends EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) +# From drivers/staging/tm6000/Makefile + +tm6000-objs := tm6000-cards.o \ + tm6000-core.o \ + tm6000-i2c.o \ + tm6000-video.o + +obj-$(CONFIG_VIDEO_TM6000) += tm6000.o diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index fd6dbd739..764072101 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -593,6 +593,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); disable_config('VIDEO_FIXED_MINOR_RANGES'); +disable_config('STAGING_BROKEN'); $intopt { "DVB_MAX_ADAPTERS" } = 8; # Check dependencies diff --git a/v4l/versions.txt b/v4l/versions.txt index f7caf396e..5a472bf1f 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -75,8 +75,9 @@ USB_GSPCA_SQ905C VIDEO_HDPVR [2.6.19] -#This driver were developed at kernel 2.6.19, requiring vmalloc_user/remap_vmalloc_range +# requires vmalloc_user/remap_vmalloc_range VIDEO_CAFE_CCIC +VIDEO_TM6000 #struct device vs struct class_device issues USB_ET61X251 USB_SN9C102 |