From 231949a499392202fb3004873f547060cd92fadf Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 21 Aug 2006 09:04:14 -0300 Subject: Added missing copyright From: Mauro Carvalho Chehab Several changes at register stuff were done since commit b45009b0288a96a3458f4f8e93cb776678d41875, but I've forgot to add the copyright line for this. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/cx88/cx88-i2c.c | 1 + 1 file changed, 1 insertion(+) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index af6bf0e34..5a1114666 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -6,6 +6,7 @@ & Marcus Metzler (mocm@thp.uni-koeln.de) (c) 2002 Yurij Sysoev (c) 1999-2003 Gerd Knorr + (c) 2005 Mauro Carvalho Chehab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit v1.2.3 From ab3d72f8f8af39a05199d1eb2f196ebf1004de46 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 21 Aug 2006 10:36:36 -0300 Subject: Fix signedness error in drivers/media/video/vivi.c From: Eric Sesterhenn when checking the -Wextra signedness warnings issued by gcc 4.1 I came across this one: drivers/media/video/vivi.c:1001: warning: comparison of unsigned expression < 0 is always false Since videobuf_reqbufs() returns negative values on errors the current code does no real error checking since gcc removes the comparison. This patch fixes this issue by making ret a normal, signed integer. Signed-off-by: Eric Sesterhenn Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/vivi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c index de72ebf74..14af7b90f 100644 --- a/linux/drivers/media/video/vivi.c +++ b/linux/drivers/media/video/vivi.c @@ -1068,7 +1068,8 @@ static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf) struct vivi_fh *fh=priv; struct videobuf_queue *q=&fh->vb_vidq; struct v4l2_requestbuffers req; - unsigned int i, ret; + unsigned int i; + int ret; req.type = q->type; req.count = 8; -- cgit v1.2.3 From 680ddb43e12202d9ffff188f9cd0e68e2d32ecaa Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 21 Aug 2006 13:14:33 -0400 Subject: Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality From: Hermann Pitton The tena_9533_di_pal_ranges use 0x04 instead the original 0x08 for the UHF (range 2) switching. This is wrong and therefore nothing happens. Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to make the UHF switch working again. Signed-off-by: Hermann Pitton Signed-off-by: Michael Krufky --- linux/drivers/media/video/tuner-types.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/tuner-types.c b/linux/drivers/media/video/tuner-types.c index 627470a08..b59e72f71 100644 --- a/linux/drivers/media/video/tuner-types.c +++ b/linux/drivers/media/video/tuner-types.c @@ -963,11 +963,17 @@ static struct tuner_params tuner_lg_tdvs_h06xf_params[] = { /* ------------ TUNER_YMEC_TVF66T5_B_DFF - Philips PAL ------------ */ +static struct tuner_range tuner_ymec_tvf66t5_b_dff_pal_ranges[] = { + { 16 * 160.25 /*MHz*/, 0x8e, 0x01, }, + { 16 * 464.25 /*MHz*/, 0x8e, 0x02, }, + { 16 * 999.99 , 0x8e, 0x08, }, +}; + static struct tuner_params tuner_ymec_tvf66t5_b_dff_params[] = { { .type = TUNER_PARAM_TYPE_PAL, - .ranges = tuner_tena_9533_di_pal_ranges, - .count = ARRAY_SIZE(tuner_tena_9533_di_pal_ranges), + .ranges = tuner_ymec_tvf66t5_b_dff_pal_ranges, + .count = ARRAY_SIZE(tuner_ymec_tvf66t5_b_dff_pal_ranges), }, }; -- cgit v1.2.3 From cb73e06fc50c861fda76a2f77ecdcfcc55606fa5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Aug 2006 09:57:24 -0300 Subject: ks0127: wire up i2c_add_driver() return value From: Alexey Dobriyan Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/ks0127.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/ks0127.c b/linux/drivers/media/video/ks0127.c index 3bf7ac4f5..c1a377f79 100644 --- a/linux/drivers/media/video/ks0127.c +++ b/linux/drivers/media/video/ks0127.c @@ -832,8 +832,7 @@ static int ks0127_detach(struct i2c_client *client) static int __devinit ks0127_init_module(void) { init_reg_defaults(); - i2c_add_driver(&i2c_driver_ks0127); - return 0; + return i2c_add_driver(&i2c_driver_ks0127); } static void __devexit ks0127_cleanup_module(void) -- cgit v1.2.3 From 94df4f1c7e458fedfc99ecdb084785476b2dbe03 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Aug 2006 11:56:51 -0300 Subject: Separe audio decoders from bttv From: Mauro Carvalho Chehab Several audio decoders were just bound as if they were part of bttv driver. In fact, they are generic enough to be used by other drivers as well, since they use I2C event bus to communicate. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/Kconfig | 28 ++++++++++++++++++++++++++++ linux/drivers/media/video/Makefile | 5 ++++- linux/drivers/media/video/bt8xx/Kconfig | 3 +++ 3 files changed, 35 insertions(+), 1 deletion(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index ebf0a7a95..41352d453 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -335,6 +335,34 @@ config VIDEO_M32R_AR_M64278 menu "Encoders and Decoders" depends on VIDEO_DEV +config VIDEO_TVAUDIO + tristate "Support for several audio decoder chips found on bt8xx boards" + depends on VIDEO_DEV && I2C + ---help--- + Support for several audio decoder chips found on some bt8xx boards: + tda8425, tea6300, tea6420, tea9840, tda985x, tda9874, pic16c54. + + To compile this driver as a module, choose M here: the + module will be called tvaudio. + +config VIDEO_TDA7432 + tristate "Support for tda7432 chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tda7432 audio decoder chip found on some bt8xx boards. + + To compile this driver as a module, choose M here: the + module will be called tda7432. + +config VIDEO_TDA9875 + tristate "Support for tda9875 chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tda9875 audio decoder chip found on some bt8xx boards. + + To compile this driver as a module, choose M here: the + module will be called tda9875. + config VIDEO_MSP3400 tristate "Micronas MSP34xx audio decoders" depends on VIDEO_DEV && I2C diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 231f62b57..d2753d107 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -17,7 +17,10 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y) endif obj-$(CONFIG_VIDEO_BT848) += bt8xx/ -obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o +obj-$(CONFIG_VIDEO_BT848) += ir-kbd-i2c.o +obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o +obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o +obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o obj-$(CONFIG_VIDEO_ZR36120) += zoran.o diff --git a/linux/drivers/media/video/bt8xx/Kconfig b/linux/drivers/media/video/bt8xx/Kconfig index cdcf55650..7eb83d9f6 100644 --- a/linux/drivers/media/video/bt8xx/Kconfig +++ b/linux/drivers/media/video/bt8xx/Kconfig @@ -9,6 +9,9 @@ config VIDEO_BT848 select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_MSP3400 + select VIDEO_TVAUDIO + select VIDEO_TDA7432 + select VIDEO_TDA9875 ---help--- Support for BT848 based frame grabber/overlay boards. This includes the Miro, Hauppauge and STB boards. Please read the material in -- cgit v1.2.3 From a0e2497b2824d51262c336373ce72cf6805431ff Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Aug 2006 12:21:18 -0300 Subject: Add some comments for Kconfig encoders/decoders itens From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/Kconfig | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 41352d453..a2fda43e8 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -335,6 +335,8 @@ config VIDEO_M32R_AR_M64278 menu "Encoders and Decoders" depends on VIDEO_DEV +comment "Audio Decoders" + config VIDEO_TVAUDIO tristate "Support for several audio decoder chips found on bt8xx boards" depends on VIDEO_DEV && I2C @@ -411,6 +413,8 @@ config VIDEO_WM8739 To compile this driver as a module, choose M here: the module will be called wm8739. +comment "Video encoders" + config VIDEO_CX2341X tristate "Conexant CX2341x MPEG encoders" depends on VIDEO_V4L2 && EXPERIMENTAL @@ -425,6 +429,17 @@ config VIDEO_CX2341X source "drivers/media/video/cx25840/Kconfig" +config VIDEO_SAA7127 + tristate "Philips SAA7127/9 digital video encoders" + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL + ---help--- + Support for the Philips SAA7127/9 digital video encoders. + + To compile this driver as a module, choose M here: the + module will be called saa7127. + +comment "Video decoders" + config VIDEO_SAA711X tristate "Philips SAA7113/4/5 video decoders" depends on VIDEO_DEV && I2C && EXPERIMENTAL @@ -443,14 +458,7 @@ config VIDEO_TVP5150 To compile this driver as a module, choose M here: the module will be called tvp5150. -config VIDEO_SAA7127 - tristate "Philips SAA7127/9 digital video encoders" - depends on VIDEO_V4L2 && I2C && EXPERIMENTAL - ---help--- - Support for the Philips SAA7127/9 digital video encoders. - - To compile this driver as a module, choose M here: the - module will be called saa7127. +comment "Video emprovement chips" config VIDEO_UPD64031A tristate "NEC Electronics uPD64031A Ghost Reduction" -- cgit v1.2.3 From 3dac2c6f8154fcc7b0d56d5744c7a8bf5ce58e25 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Aug 2006 15:37:41 -0300 Subject: Fixed module name, since it is, in fact, a decoder. From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/vpx3220.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/vpx3220.c b/linux/drivers/media/video/vpx3220.c index ad92a39a8..01f83d285 100644 --- a/linux/drivers/media/video/vpx3220.c +++ b/linux/drivers/media/video/vpx3220.c @@ -745,6 +745,6 @@ vpx3220_cleanup (void) module_init(vpx3220_init); module_exit(vpx3220_cleanup); -MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video encoder driver"); +MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver"); MODULE_AUTHOR("Laurent Pinchart"); MODULE_LICENSE("GPL"); -- cgit v1.2.3 From bb2c598e53bcc00348530ca81fb5147015c7e9ba Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Aug 2006 15:38:18 -0300 Subject: Split audio/video encoders/decoders from main drivers From: Mauro Carvalho Chehab Several audio/video encoders/decoders were just bound as if they were part of the core driver. In fact, they are generic enough to be used by other drivers as well, since they use I2C event bus to communicate. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/Kconfig | 160 ++++++++++++++++++++++++++++++++++++- linux/drivers/media/video/Makefile | 37 ++++++--- 2 files changed, 182 insertions(+), 15 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index a2fda43e8..548bf70de 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -164,6 +164,7 @@ config VIDEO_VINO tristate "SGI Vino Video For Linux (EXPERIMENTAL)" depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2 select I2C_ALGO_SGI + select VIDEO_SAA7191 help Say Y here to build in support for the Vino video input system found on SGI Indy machines. @@ -176,6 +177,9 @@ config VIDEO_STRADIS driver for PCI. There is a product page at . +config VIDEO_ZORAN_ZR36060 + tristate + config VIDEO_ZORAN tristate "Zoran ZR36057/36067 Video For Linux" depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64 @@ -192,12 +196,18 @@ config VIDEO_ZORAN config VIDEO_ZORAN_BUZ tristate "Iomega Buz support" depends on VIDEO_ZORAN + select VIDEO_SAA7111 + select VIDEO_SAA7185 + select VIDEO_ZORAN_ZR36060 help Support for the Iomega Buz MJPEG capture/playback card. config VIDEO_ZORAN_DC10 tristate "Pinnacle/Miro DC10(+) support" depends on VIDEO_ZORAN + select VIDEO_SAA7110 + select VIDEO_ADV7175 + select VIDEO_ZORAN_ZR36060 help Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback card. @@ -205,6 +215,8 @@ config VIDEO_ZORAN_DC10 config VIDEO_ZORAN_DC30 tristate "Pinnacle/Miro DC30(+) support" depends on VIDEO_ZORAN + select VIDEO_ADV7175 + select VIDEO_VPX3220 help Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback card. This also supports really old DC10 cards based on the @@ -213,6 +225,9 @@ config VIDEO_ZORAN_DC30 config VIDEO_ZORAN_LML33 tristate "Linux Media Labs LML33 support" depends on VIDEO_ZORAN + select VIDEO_BT819 + select VIDEO_BT856 + select VIDEO_ZORAN_ZR36060 help Support for the Linux Media Labs LML33 MJPEG capture/playback card. @@ -220,6 +235,9 @@ config VIDEO_ZORAN_LML33 config VIDEO_ZORAN_LML33R10 tristate "Linux Media Labs LML33R10 support" depends on VIDEO_ZORAN + select VIDEO_SAA7114 + select VIDEO_ADV7170 + select VIDEO_ZORAN_ZR36060 help support for the Linux Media Labs LML33R10 MJPEG capture/playback card. @@ -227,6 +245,9 @@ config VIDEO_ZORAN_LML33R10 config VIDEO_ZORAN_AVS6EYES tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1 + select VIDEO_BT856 + select VIDEO_KS0127 + select VIDEO_ZORAN_ZR36060 help Support for the AverMedia 6 Eyes video surveillance card. @@ -263,6 +284,10 @@ config VIDEO_MXB depends on PCI && VIDEO_V4L1 select VIDEO_SAA7146_VV select VIDEO_TUNER + select VIDEO_SAA7111 + select VIDEO_TDA9840 + select VIDEO_TEA6415C + select VIDEO_TEA6420 ---help--- This is a video4linux driver for the 'Multimedia eXtension Board' TV card by Siemens-Nixdorf. @@ -274,6 +299,7 @@ config VIDEO_DPC tristate "Philips-Semiconductors 'dpc7146 demonstration board'" depends on PCI && VIDEO_V4L1 select VIDEO_SAA7146_VV + select VIDEO_SAA7111 ---help--- This is a video4linux driver for the 'dpc7146 demonstration board' by Philips-Semiconductors. It's the reference design @@ -356,6 +382,15 @@ config VIDEO_TDA7432 To compile this driver as a module, choose M here: the module will be called tda7432. +config VIDEO_TDA9840 + tristate "Support for tda9840 chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tda9840 audio decoder chip found on some Zoran boards. + + To compile this driver as a module, choose M here: the + module will be called tda9840. + config VIDEO_TDA9875 tristate "Support for tda9875 chip" depends on VIDEO_DEV && I2C @@ -365,6 +400,24 @@ config VIDEO_TDA9875 To compile this driver as a module, choose M here: the module will be called tda9875. +config VIDEO_TEA6415C + tristate "Support for tea6415c chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tea6415c audio decoder chip found on some bt8xx boards. + + To compile this driver as a module, choose M here: the + module will be called tea6415c. + +config VIDEO_TEA6420 + tristate "Support for tea6420 chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tea6420 audio decoder chip found on some bt8xx boards. + + To compile this driver as a module, choose M here: the + module will be called tea6420. + config VIDEO_MSP3400 tristate "Micronas MSP34xx audio decoders" depends on VIDEO_DEV && I2C @@ -413,7 +466,7 @@ config VIDEO_WM8739 To compile this driver as a module, choose M here: the module will be called wm8739. -comment "Video encoders" +comment "MPEG video encoders" config VIDEO_CX2341X tristate "Conexant CX2341x MPEG encoders" @@ -429,6 +482,17 @@ config VIDEO_CX2341X source "drivers/media/video/cx25840/Kconfig" +config VIDEO_SAA7185 + tristate "Philips SAA7185 video encoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for the Philips SAA7185 video encoder. + + To compile this driver as a module, choose M here: the + module will be called saa7185. + +comment "Video encoders" + config VIDEO_SAA7127 tristate "Philips SAA7127/9 digital video encoders" depends on VIDEO_V4L2 && I2C && EXPERIMENTAL @@ -438,8 +502,82 @@ config VIDEO_SAA7127 To compile this driver as a module, choose M here: the module will be called saa7127. +config VIDEO_ADV7170 + tristate "Analog Devices ADV7170 video encoder driver" + depends on VIDEO_V4L2 && I2C + ---help--- + Support for the Analog Devices ADV7170 video encoder driver + + To compile this driver as a module, choose M here: the + module will be called adv7170. + +config VIDEO_ADV7175 + tristate "Analog Devices ADV7175 video encoder driver" + depends on VIDEO_V4L2 && I2C + ---help--- + Support for the Analog Devices ADV7175 video encoder driver + + To compile this driver as a module, choose M here: the + module will be called adv7175. + comment "Video decoders" +config VIDEO_BT819 + tristate "BT819A VideoStream Decoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for BT819A video decoder. + + To compile this driver as a module, choose M here: the + module will be called bt819. + +config VIDEO_BT856 + tristate "BT856 VideoStream Decoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for BT856 video decoder. + + To compile this driver as a module, choose M here: the + module will be called bt856. + +config VIDEO_BT866 + tristate "BT866 VideoStream Decoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for BT866 video decoder. + + To compile this driver as a module, choose M here: the + module will be called bt866. + +config VIDEO_SAA7110 + tristate "Philips SAA7110 video decoder" + depends on VIDEO_DEV + ---help--- + Support for the Philips SAA7110 video decoders. + + To compile this driver as a module, choose M here: the + module will be called saa7110. + +config VIDEO_SAA7111 + tristate "Philips SAA7111 video decoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for the Philips SAA711 video decoder. + + To compile this driver as a module, choose M here: the + module will be called saa7111. + +config VIDEO_SAA7114 + tristate "Philips SAA7114 video decoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for the Philips SAA7114 video decoder. This driver + is used only on Zoran driver and should be moved soon to + SAA711x module. + + To compile this driver as a module, choose M here: the + module will be called saa7114. + config VIDEO_SAA711X tristate "Philips SAA7113/4/5 video decoders" depends on VIDEO_DEV && I2C && EXPERIMENTAL @@ -449,6 +587,15 @@ config VIDEO_SAA711X To compile this driver as a module, choose M here: the module will be called saa7115. +config VIDEO_SAA7191 + tristate "Philips SAA7191 video decoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for the Philips SAA7191 video decoder. + + To compile this driver as a module, choose M here: the + module will be called saa7191. + config VIDEO_TVP5150 tristate "Texas Instruments TVP5150 video decoder" depends on VIDEO_DEV && I2C @@ -458,7 +605,16 @@ config VIDEO_TVP5150 To compile this driver as a module, choose M here: the module will be called tvp5150. -comment "Video emprovement chips" +config VIDEO_VPX3220 + tristate "vpx3220a, vpx3216b & vpx3214c video decoder driver" + depends on VIDEO_DEV && I2C + ---help--- + Support for VPX322x video decoders. + + To compile this driver as a module, choose M here: the + module will be called vpx3220. + +comment "Video improvement chips" config VIDEO_UPD64031A tristate "NEC Electronics uPD64031A Ghost Reduction" diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index d2753d107..eecbede6c 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -30,17 +30,31 @@ obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o obj-$(CONFIG_VIDEO_W9966) += w9966.o -obj-$(CONFIG_VIDEO_ZORAN_BUZ) += saa7111.o saa7185.o zr36060.o -obj-$(CONFIG_VIDEO_ZORAN_DC10) += saa7110.o adv7175.o zr36060.o -obj-$(CONFIG_VIDEO_ZORAN_DC30) += adv7175.o vpx3220.o zr36050.o \ - zr36016.o -obj-$(CONFIG_VIDEO_ZORAN_LML33) += bt819.o bt856.o zr36060.o -obj-$(CONFIG_VIDEO_ZORAN_LML33R10) += saa7114.o adv7170.o zr36060.o -obj-$(CONFIG_VIDEO_ZORAN_AVS6EYES) += bt866.o ks0127.o zr36060.o + +obj-$(CONFIG_VIDEO_TDA9840) += tda9840.o +obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o +obj-$(CONFIG_VIDEO_TEA6420) += tea6420.o +obj-$(CONFIG_VIDEO_SAA7110) += saa7110.o +obj-$(CONFIG_VIDEO_SAA7111) += saa7111.o +obj-$(CONFIG_VIDEO_SAA7114) += saa7114.o +obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o +obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o +obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o +obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o +obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o +obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o +obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o +obj-$(CONFIG_VIDEO_BT819) += bt819.o +obj-$(CONFIG_VIDEO_BT856) += bt856.o +obj-$(CONFIG_VIDEO_BT866) += bt866.o + obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o +obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o +obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o + obj-$(CONFIG_VIDEO_PMS) += pms.o obj-$(CONFIG_VIDEO_PLANB) += planb.o -obj-$(CONFIG_VIDEO_VINO) += vino.o saa7191.o indycam.o +obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o obj-$(CONFIG_VIDEO_STRADIS) += stradis.o obj-$(CONFIG_VIDEO_CPIA) += cpia.o obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o @@ -58,10 +72,10 @@ obj-$(CONFIG_VIDEO_WM8775) += wm8775.o obj-$(CONFIG_VIDEO_WM8739) += wm8739.o obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ -obj-$(CONFIG_VIDEO_MXB) += saa7111.o tda9840.o tea6415c.o tea6420.o mxb.o +obj-$(CONFIG_VIDEO_MXB) += mxb.o obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o -obj-$(CONFIG_VIDEO_DPC) += saa7111.o dpc7146.o +obj-$(CONFIG_VIDEO_DPC) += dpc7146.o obj-$(CONFIG_TUNER_3036) += tuner-3036.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o @@ -73,8 +87,6 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o obj-$(CONFIG_VIDEO_CX25840) += cx25840/ -obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o -obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o @@ -99,4 +111,3 @@ obj-$(CONFIG_VIDEO_VIVI) += vivi.o EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT - -- cgit v1.2.3 From 49eb5b761f29da3bc4fe473645d6a10df649eea8 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Aug 2006 16:14:36 -0300 Subject: Improved descriptions of audio chips From: Mauro Carvalho Chehab Also, saa7185 were at wrong place. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/Kconfig | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 548bf70de..b149d8366 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -364,17 +364,19 @@ menu "Encoders and Decoders" comment "Audio Decoders" config VIDEO_TVAUDIO - tristate "Support for several audio decoder chips found on bt8xx boards" + tristate "Simple audio decoder chips" depends on VIDEO_DEV && I2C ---help--- Support for several audio decoder chips found on some bt8xx boards: - tda8425, tea6300, tea6420, tea9840, tda985x, tda9874, pic16c54. + Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300, + tea6320, tea6420, tda8425, ta8874z. + Microchip: pic16c54 based design on ProVideo PV951 board. To compile this driver as a module, choose M here: the module will be called tvaudio. config VIDEO_TDA7432 - tristate "Support for tda7432 chip" + tristate "Philips TDA7432 audio processor chip" depends on VIDEO_DEV && I2C ---help--- Support for tda7432 audio decoder chip found on some bt8xx boards. @@ -383,7 +385,7 @@ config VIDEO_TDA7432 module will be called tda7432. config VIDEO_TDA9840 - tristate "Support for tda9840 chip" + tristate "Philips TDA9840 audio processor chip" depends on VIDEO_DEV && I2C ---help--- Support for tda9840 audio decoder chip found on some Zoran boards. @@ -392,7 +394,7 @@ config VIDEO_TDA9840 module will be called tda9840. config VIDEO_TDA9875 - tristate "Support for tda9875 chip" + tristate "Philips TDA9875 audio processor chip" depends on VIDEO_DEV && I2C ---help--- Support for tda9875 audio decoder chip found on some bt8xx boards. @@ -401,7 +403,7 @@ config VIDEO_TDA9875 module will be called tda9875. config VIDEO_TEA6415C - tristate "Support for tea6415c chip" + tristate "Philips TEA6415C audio processor chip" depends on VIDEO_DEV && I2C ---help--- Support for tea6415c audio decoder chip found on some bt8xx boards. @@ -410,7 +412,7 @@ config VIDEO_TEA6415C module will be called tea6415c. config VIDEO_TEA6420 - tristate "Support for tea6420 chip" + tristate "Philips TEA6420 audio processor chip" depends on VIDEO_DEV && I2C ---help--- Support for tea6420 audio decoder chip found on some bt8xx boards. @@ -482,15 +484,6 @@ config VIDEO_CX2341X source "drivers/media/video/cx25840/Kconfig" -config VIDEO_SAA7185 - tristate "Philips SAA7185 video encoder" - depends on VIDEO_DEV && I2C - ---help--- - Support for the Philips SAA7185 video encoder. - - To compile this driver as a module, choose M here: the - module will be called saa7185. - comment "Video encoders" config VIDEO_SAA7127 @@ -502,6 +495,15 @@ config VIDEO_SAA7127 To compile this driver as a module, choose M here: the module will be called saa7127. +config VIDEO_SAA7185 + tristate "Philips SAA7185 video encoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for the Philips SAA7185 video encoder. + + To compile this driver as a module, choose M here: the + module will be called saa7185. + config VIDEO_ADV7170 tristate "Analog Devices ADV7170 video encoder driver" depends on VIDEO_V4L2 && I2C -- cgit v1.2.3 From 125b516574d6abb9ccb8a00fbec36a16ee7eb18c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Aug 2006 18:49:17 -0300 Subject: Allow manually selecting the proper helper drivers From: Mauro Carvalho Chehab There are several boards on V4L that can work with several different helper modules for audio/video encoding/decoding and similar stuff. This patch adds the capability of choicing between autoselecting the pertinent helper modules for each driver, or to manually selecting them. Acked-by: Michael Krufky Acked-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/Kconfig | 931 +++++++++++++++--------------- linux/drivers/media/video/bt8xx/Kconfig | 8 +- linux/drivers/media/video/em28xx/Kconfig | 4 +- linux/drivers/media/video/pvrusb2/Kconfig | 18 +- 4 files changed, 494 insertions(+), 467 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index b149d8366..9d2f3715b 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -16,632 +16,645 @@ config VIDEO_ADV_DEBUG V4L devices. In doubt, say N. -config VIDEO_VIVI - tristate "Virtual Video Driver" - depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 - select VIDEO_BUF - default n +config VIDEO_HELPER_CHIPS_AUTO + bool "Autoselect pertinent encoders/decoders and other helper chips" + default y ---help--- - Enables a virtual video driver. This device shows a color bar - and a timestamp, as a real device would generate by using V4L2 - api. - Say Y here if you want to test video apps or debug V4L devices. - In doubt, say N. - -source "drivers/media/video/bt8xx/Kconfig" + Most video cards may require additional modules to encode or + decode audio/video standards. This option will autoselect + all pertinent modules to each selected video module. -config VIDEO_SAA6588 - tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards" - depends on I2C && VIDEO_BT848 - - help - Support for Radio Data System (RDS) decoder. This allows seeing - radio station identification transmitted using this standard. - Currentlly, it works only with bt8x8 chips. + Unselect this only if you know exaclty what you are doing, since + it may break support on some boards. - To compile this driver as a module, choose M here: the - module will be called saa6588. + In doubt, say Y. -config VIDEO_PMS - tristate "Mediavision Pro Movie Studio Video For Linux" - depends on ISA && VIDEO_V4L1 - help - Say Y if you have such a thing. +# +# Encoder / Decoder module configuration +# - To compile this driver as a module, choose M here: the - module will be called pms. +menu "Encoders/decoders and other helper chips" + depends on VIDEO_DEV && !VIDEO_HELPER_CHIPS_AUTO -config VIDEO_PLANB - tristate "PlanB Video-In on PowerMac" - depends on PPC_PMAC && VIDEO_V4L1 && BROKEN - help - PlanB is the V4L driver for the PowerMac 7x00/8x00 series video - input hardware. If you want to experiment with this, say Y. - Otherwise, or if you don't understand a word, say N. See - for more info. - - Saying M will compile this driver as a module (planb). +comment "Audio Decoders" -config VIDEO_BWQCAM - tristate "Quickcam BW Video For Linux" - depends on PARPORT && VIDEO_V4L1 - help - Say Y have if you the black and white version of the QuickCam - camera. See the next option for the color version. +config VIDEO_TVAUDIO + tristate "Simple audio decoder chips" + depends on VIDEO_DEV && I2C + ---help--- + Support for several audio decoder chips found on some bt8xx boards: + Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300, + tea6320, tea6420, tda8425, ta8874z. + Microchip: pic16c54 based design on ProVideo PV951 board. To compile this driver as a module, choose M here: the - module will be called bw-qcam. - -config VIDEO_CQCAM - tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)" - depends on EXPERIMENTAL && PARPORT && VIDEO_V4L1 - help - This is the video4linux driver for the colour version of the - Connectix QuickCam. If you have one of these cameras, say Y here, - otherwise say N. This driver does not work with the original - monochrome QuickCam, QuickCam VC or QuickClip. It is also available - as a module (c-qcam). - Read for more information. - -config VIDEO_W9966 - tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux" - depends on PARPORT_1284 && PARPORT && VIDEO_V4L1 - help - Video4linux driver for Winbond's w9966 based Webcams. - Currently tested with the LifeView FlyCam Supra. - If you have one of these cameras, say Y here - otherwise say N. - This driver is also available as a module (w9966). - - Check out for more - information. + module will be called tvaudio. -config VIDEO_CPIA - tristate "CPiA Video For Linux" - depends on VIDEO_V4L1 +config VIDEO_TDA7432 + tristate "Philips TDA7432 audio processor chip" + depends on VIDEO_DEV && I2C ---help--- - This is the video4linux driver for cameras based on Vision's CPiA - (Colour Processor Interface ASIC), such as the Creative Labs Video - Blaster Webcam II. If you have one of these cameras, say Y here - and select parallel port and/or USB lowlevel support below, - otherwise say N. This will not work with the Creative Webcam III. - - Please read for more - information. - - This driver is also available as a module (cpia). - -config VIDEO_CPIA_PP - tristate "CPiA Parallel Port Lowlevel Support" - depends on PARPORT_1284 && VIDEO_CPIA && PARPORT - help - This is the lowlevel parallel port support for cameras based on - Vision's CPiA (Colour Processor Interface ASIC), such as the - Creative Webcam II. If you have the parallel port version of one - of these cameras, say Y here, otherwise say N. It is also available - as a module (cpia_pp). - -config VIDEO_CPIA_USB - tristate "CPiA USB Lowlevel Support" - depends on VIDEO_CPIA && USB - help - This is the lowlevel USB support for cameras based on Vision's CPiA - (Colour Processor Interface ASIC), such as the Creative Webcam II. - If you have the USB version of one of these cameras, say Y here, - otherwise say N. This will not work with the Creative Webcam III. - It is also available as a module (cpia_usb). - -source "drivers/media/video/cpia2/Kconfig" - -config VIDEO_SAA5246A - tristate "SAA5246A, SAA5281 Teletext processor" - depends on I2C && VIDEO_V4L2 - help - Support for I2C bus based teletext using the SAA5246A or SAA5281 - chip. Useful only if you live in Europe. + Support for tda7432 audio decoder chip found on some bt8xx boards. To compile this driver as a module, choose M here: the - module will be called saa5246a. + module will be called tda7432. -config VIDEO_SAA5249 - tristate "SAA5249 Teletext processor" - depends on VIDEO_DEV && I2C && VIDEO_V4L2 - help - Support for I2C bus based teletext using the SAA5249 chip. At the - moment this is only useful on some European WinTV cards. +config VIDEO_TDA9840 + tristate "Philips TDA9840 audio processor chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tda9840 audio decoder chip found on some Zoran boards. To compile this driver as a module, choose M here: the - module will be called saa5249. + module will be called tda9840. -config TUNER_3036 - tristate "SAB3036 tuner" - depends on VIDEO_DEV && I2C && VIDEO_V4L1 - help - Say Y here to include support for Philips SAB3036 compatible tuners. - If in doubt, say N. +config VIDEO_TDA9875 + tristate "Philips TDA9875 audio processor chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tda9875 audio decoder chip found on some bt8xx boards. -config VIDEO_VINO - tristate "SGI Vino Video For Linux (EXPERIMENTAL)" - depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2 - select I2C_ALGO_SGI - select VIDEO_SAA7191 - help - Say Y here to build in support for the Vino video input system found - on SGI Indy machines. + To compile this driver as a module, choose M here: the + module will be called tda9875. -config VIDEO_STRADIS - tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)" - depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && !PPC64 - help - Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video - driver for PCI. There is a product page at - . +config VIDEO_TEA6415C + tristate "Philips TEA6415C audio processor chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tea6415c audio decoder chip found on some bt8xx boards. -config VIDEO_ZORAN_ZR36060 - tristate + To compile this driver as a module, choose M here: the + module will be called tea6415c. -config VIDEO_ZORAN - tristate "Zoran ZR36057/36067 Video For Linux" - depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64 - help - Say Y for support for MJPEG capture cards based on the Zoran - 36057/36067 PCI controller chipset. This includes the Iomega - Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is - a driver homepage at . For - more information, check . +config VIDEO_TEA6420 + tristate "Philips TEA6420 audio processor chip" + depends on VIDEO_DEV && I2C + ---help--- + Support for tea6420 audio decoder chip found on some bt8xx boards. To compile this driver as a module, choose M here: the - module will be called zr36067. + module will be called tea6420. -config VIDEO_ZORAN_BUZ - tristate "Iomega Buz support" - depends on VIDEO_ZORAN - select VIDEO_SAA7111 - select VIDEO_SAA7185 - select VIDEO_ZORAN_ZR36060 - help - Support for the Iomega Buz MJPEG capture/playback card. +config VIDEO_MSP3400 + tristate "Micronas MSP34xx audio decoders" + depends on VIDEO_DEV && I2C + ---help--- + Support for the Micronas MSP34xx series of audio decoders. -config VIDEO_ZORAN_DC10 - tristate "Pinnacle/Miro DC10(+) support" - depends on VIDEO_ZORAN - select VIDEO_SAA7110 - select VIDEO_ADV7175 - select VIDEO_ZORAN_ZR36060 - help - Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback - card. + To compile this driver as a module, choose M here: the + module will be called msp3400. -config VIDEO_ZORAN_DC30 - tristate "Pinnacle/Miro DC30(+) support" - depends on VIDEO_ZORAN - select VIDEO_ADV7175 - select VIDEO_VPX3220 - help - Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback - card. This also supports really old DC10 cards based on the - zr36050 MJPEG codec and zr36016 VFE. +config VIDEO_CS53L32A + tristate "Cirrus Logic CS53L32A audio ADC" + depends on VIDEO_DEV && I2C && EXPERIMENTAL + ---help--- + Support for the Cirrus Logic CS53L32A low voltage + stereo A/D converter. -config VIDEO_ZORAN_LML33 - tristate "Linux Media Labs LML33 support" - depends on VIDEO_ZORAN - select VIDEO_BT819 - select VIDEO_BT856 - select VIDEO_ZORAN_ZR36060 - help - Support for the Linux Media Labs LML33 MJPEG capture/playback - card. + To compile this driver as a module, choose M here: the + module will be called cs53l32a. -config VIDEO_ZORAN_LML33R10 - tristate "Linux Media Labs LML33R10 support" - depends on VIDEO_ZORAN - select VIDEO_SAA7114 - select VIDEO_ADV7170 - select VIDEO_ZORAN_ZR36060 - help - support for the Linux Media Labs LML33R10 MJPEG capture/playback - card. +config VIDEO_TLV320AIC23B + tristate "Texas Instruments TLV320AIC23B audio codec" + depends on VIDEO_DEV && I2C && EXPERIMENTAL + ---help--- + Support for the Texas Instruments TLV320AIC23B audio codec. -config VIDEO_ZORAN_AVS6EYES - tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" - depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1 - select VIDEO_BT856 - select VIDEO_KS0127 - select VIDEO_ZORAN_ZR36060 - help - Support for the AverMedia 6 Eyes video surveillance card. + To compile this driver as a module, choose M here: the + module will be called tlv320aic23b. -config VIDEO_ZR36120 - tristate "Zoran ZR36120/36125 Video For Linux" - depends on PCI && I2C && VIDEO_V4L1 && BROKEN - help - Support for ZR36120/ZR36125 based frame grabber/overlay boards. - This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV, - and Buster boards. Please read the material in - for more information. +config VIDEO_WM8775 + tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer" + depends on VIDEO_DEV && I2C && EXPERIMENTAL + ---help--- + Support for the Wolfson Microelectronics WM8775 high + performance stereo A/D Converter with a 4 channel input mixer. To compile this driver as a module, choose M here: the - module will be called zr36120. + module will be called wm8775. -config VIDEO_MEYE - tristate "Sony Vaio Picturebook Motion Eye Video For Linux" - depends on PCI && SONYPI && VIDEO_V4L1 +config VIDEO_WM8739 + tristate "Wolfson Microelectronics WM8739 stereo audio ADC" + depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- - This is the video4linux driver for the Motion Eye camera found - in the Vaio Picturebook laptops. Please read the material in - for more information. - - If you say Y or M here, you need to say Y or M to "Sony Programmable - I/O Control Device" in the character device section. + Support for the Wolfson Microelectronics WM8739 + stereo A/D Converter. To compile this driver as a module, choose M here: the - module will be called meye. + module will be called wm8739. -source "drivers/media/video/saa7134/Kconfig" +comment "MPEG video encoders" -config VIDEO_MXB - tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" - depends on PCI && VIDEO_V4L1 - select VIDEO_SAA7146_VV - select VIDEO_TUNER - select VIDEO_SAA7111 - select VIDEO_TDA9840 - select VIDEO_TEA6415C - select VIDEO_TEA6420 +config VIDEO_CX2341X + tristate "Conexant CX2341x MPEG encoders" + depends on VIDEO_V4L2 && EXPERIMENTAL ---help--- - This is a video4linux driver for the 'Multimedia eXtension Board' - TV card by Siemens-Nixdorf. + Support for the Conexant CX23416 MPEG encoders + and CX23415 MPEG encoder/decoders. + + This module currently supports the encoding functions only. To compile this driver as a module, choose M here: the - module will be called mxb. + module will be called cx2341x. -config VIDEO_DPC - tristate "Philips-Semiconductors 'dpc7146 demonstration board'" - depends on PCI && VIDEO_V4L1 - select VIDEO_SAA7146_VV - select VIDEO_SAA7111 - ---help--- - This is a video4linux driver for the 'dpc7146 demonstration - board' by Philips-Semiconductors. It's the reference design - for SAA7146 bases boards, so if you have some unsupported - saa7146 based, analog video card, chances are good that it - will work with this skeleton driver. +source "drivers/media/video/cx25840/Kconfig" - To compile this driver as a module, choose M here: the - module will be called dpc7146. +comment "Video encoders" -config VIDEO_HEXIUM_ORION - tristate "Hexium HV-PCI6 and Orion frame grabber" - depends on PCI && VIDEO_V4L2 - select VIDEO_SAA7146_VV +config VIDEO_SAA7127 + tristate "Philips SAA7127/9 digital video encoders" + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- - This is a video4linux driver for the Hexium HV-PCI6 and - Orion frame grabber cards by Hexium. + Support for the Philips SAA7127/9 digital video encoders. To compile this driver as a module, choose M here: the - module will be called hexium_orion. + module will be called saa7127. -config VIDEO_HEXIUM_GEMINI - tristate "Hexium Gemini frame grabber" - depends on PCI && VIDEO_V4L2 - select VIDEO_SAA7146_VV +config VIDEO_SAA7185 + tristate "Philips SAA7185 video encoder" + depends on VIDEO_DEV && I2C ---help--- - This is a video4linux driver for the Hexium Gemini frame - grabber card by Hexium. Please note that the Gemini Dual - card is *not* fully supported. + Support for the Philips SAA7185 video encoder. To compile this driver as a module, choose M here: the - module will be called hexium_gemini. - -source "drivers/media/video/cx88/Kconfig" + module will be called saa7185. -config VIDEO_M32R_AR - tristate "AR devices" - depends on M32R && VIDEO_V4L1 +config VIDEO_ADV7170 + tristate "Analog Devices ADV7170 video encoder driver" + depends on VIDEO_V4L2 && I2C ---help--- - This is a video4linux driver for the Renesas AR (Artificial Retina) - camera module. + Support for the Analog Devices ADV7170 video encoder driver -config VIDEO_M32R_AR_M64278 - tristate "AR device with color module M64278(VGA)" - depends on PLAT_M32700UT - select VIDEO_M32R_AR - ---help--- - This is a video4linux driver for the Renesas AR (Artificial - Retina) with M64278E-800 camera module. - This module supports VGA(640x480 pixels) resolutions. + To compile this driver as a module, choose M here: the + module will be called adv7170. + +config VIDEO_ADV7175 + tristate "Analog Devices ADV7175 video encoder driver" + depends on VIDEO_V4L2 && I2C + ---help--- + Support for the Analog Devices ADV7175 video encoder driver To compile this driver as a module, choose M here: the - module will be called arv. + module will be called adv7175. -# -# Encoder / Decoder module configuration -# +comment "Video decoders" -menu "Encoders and Decoders" - depends on VIDEO_DEV +config VIDEO_BT819 + tristate "BT819A VideoStream Decoder" + depends on VIDEO_DEV && I2C + ---help--- + Support for BT819A video decoder. -comment "Audio Decoders" + To compile this driver as a module, choose M here: the + module will be called bt819. -config VIDEO_TVAUDIO - tristate "Simple audio decoder chips" +config VIDEO_BT856 + tristate "BT856 VideoStream Decoder" depends on VIDEO_DEV && I2C ---help--- - Support for several audio decoder chips found on some bt8xx boards: - Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300, - tea6320, tea6420, tda8425, ta8874z. - Microchip: pic16c54 based design on ProVideo PV951 board. + Support for BT856 video decoder. To compile this driver as a module, choose M here: the - module will be called tvaudio. + module will be called bt856. -config VIDEO_TDA7432 - tristate "Philips TDA7432 audio processor chip" +config VIDEO_BT866 + tristate "BT866 VideoStream Decoder" depends on VIDEO_DEV && I2C ---help--- - Support for tda7432 audio decoder chip found on some bt8xx boards. + Support for BT866 video decoder. To compile this driver as a module, choose M here: the - module will be called tda7432. + module will be called bt866. -config VIDEO_TDA9840 - tristate "Philips TDA9840 audio processor chip" - depends on VIDEO_DEV && I2C +config VIDEO_SAA7110 + tristate "Philips SAA7110 video decoder" + depends on VIDEO_DEV ---help--- - Support for tda9840 audio decoder chip found on some Zoran boards. + Support for the Philips SAA7110 video decoders. To compile this driver as a module, choose M here: the - module will be called tda9840. + module will be called saa7110. -config VIDEO_TDA9875 - tristate "Philips TDA9875 audio processor chip" +config VIDEO_SAA7111 + tristate "Philips SAA7111 video decoder" depends on VIDEO_DEV && I2C ---help--- - Support for tda9875 audio decoder chip found on some bt8xx boards. + Support for the Philips SAA711 video decoder. To compile this driver as a module, choose M here: the - module will be called tda9875. + module will be called saa7111. -config VIDEO_TEA6415C - tristate "Philips TEA6415C audio processor chip" +config VIDEO_SAA7114 + tristate "Philips SAA7114 video decoder" depends on VIDEO_DEV && I2C ---help--- - Support for tea6415c audio decoder chip found on some bt8xx boards. + Support for the Philips SAA7114 video decoder. This driver + is used only on Zoran driver and should be moved soon to + SAA711x module. To compile this driver as a module, choose M here: the - module will be called tea6415c. + module will be called saa7114. -config VIDEO_TEA6420 - tristate "Philips TEA6420 audio processor chip" - depends on VIDEO_DEV && I2C +config VIDEO_SAA711X + tristate "Philips SAA7113/4/5 video decoders" + depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- - Support for tea6420 audio decoder chip found on some bt8xx boards. + Support for the Philips SAA7113/4/5 video decoders. To compile this driver as a module, choose M here: the - module will be called tea6420. + module will be called saa7115. -config VIDEO_MSP3400 - tristate "Micronas MSP34xx audio decoders" +config VIDEO_SAA7191 + tristate "Philips SAA7191 video decoder" depends on VIDEO_DEV && I2C ---help--- - Support for the Micronas MSP34xx series of audio decoders. + Support for the Philips SAA7191 video decoder. To compile this driver as a module, choose M here: the - module will be called msp3400. + module will be called saa7191. -config VIDEO_CS53L32A - tristate "Cirrus Logic CS53L32A audio ADC" - depends on VIDEO_DEV && I2C && EXPERIMENTAL +config VIDEO_TVP5150 + tristate "Texas Instruments TVP5150 video decoder" + depends on VIDEO_DEV && I2C ---help--- - Support for the Cirrus Logic CS53L32A low voltage - stereo A/D converter. + Support for the Texas Instruments TVP5150 video decoder. To compile this driver as a module, choose M here: the - module will be called cs53l32a. + module will be called tvp5150. -config VIDEO_TLV320AIC23B - tristate "Texas Instruments TLV320AIC23B audio codec" - depends on VIDEO_DEV && I2C && EXPERIMENTAL +config VIDEO_VPX3220 + tristate "vpx3220a, vpx3216b & vpx3214c video decoder driver" + depends on VIDEO_DEV && I2C ---help--- - Support for the Texas Instruments TLV320AIC23B audio codec. + Support for VPX322x video decoders. To compile this driver as a module, choose M here: the - module will be called tlv320aic23b. + module will be called vpx3220. -config VIDEO_WM8775 - tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer" - depends on VIDEO_DEV && I2C && EXPERIMENTAL +comment "Video improvement chips" + +config VIDEO_UPD64031A + tristate "NEC Electronics uPD64031A Ghost Reduction" + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- - Support for the Wolfson Microelectronics WM8775 high - performance stereo A/D Converter with a 4 channel input mixer. + Support for the NEC Electronics uPD64031A Ghost Reduction + video chip. It is most often found in NTSC TV cards made for + Japan and is used to reduce the 'ghosting' effect that can + be present in analog TV broadcasts. To compile this driver as a module, choose M here: the - module will be called wm8775. + module will be called upd64031a. -config VIDEO_WM8739 - tristate "Wolfson Microelectronics WM8739 stereo audio ADC" - depends on VIDEO_DEV && I2C && EXPERIMENTAL +config VIDEO_UPD64083 + tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation" + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- - Support for the Wolfson Microelectronics WM8739 - stereo A/D Converter. + Support for the NEC Electronics uPD64083 3-Dimensional Y/C + separation video chip. It is used to improve the quality of + the colors of a composite signal. To compile this driver as a module, choose M here: the - module will be called wm8739. + module will be called upd64083. -comment "MPEG video encoders" +endmenu # encoder / decoder chips -config VIDEO_CX2341X - tristate "Conexant CX2341x MPEG encoders" - depends on VIDEO_V4L2 && EXPERIMENTAL +config VIDEO_VIVI + tristate "Virtual Video Driver" + depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 + select VIDEO_BUF + default n ---help--- - Support for the Conexant CX23416 MPEG encoders - and CX23415 MPEG encoder/decoders. + Enables a virtual video driver. This device shows a color bar + and a timestamp, as a real device would generate by using V4L2 + api. + Say Y here if you want to test video apps or debug V4L devices. + In doubt, say N. - This module currently supports the encoding functions only. +source "drivers/media/video/bt8xx/Kconfig" + +config VIDEO_SAA6588 + tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards" + depends on I2C && VIDEO_BT848 + + help + Support for Radio Data System (RDS) decoder. This allows seeing + radio station identification transmitted using this standard. + Currentlly, it works only with bt8x8 chips. To compile this driver as a module, choose M here: the - module will be called cx2341x. + module will be called saa6588. -source "drivers/media/video/cx25840/Kconfig" +config VIDEO_PMS + tristate "Mediavision Pro Movie Studio Video For Linux" + depends on ISA && VIDEO_V4L1 + help + Say Y if you have such a thing. -comment "Video encoders" + To compile this driver as a module, choose M here: the + module will be called pms. -config VIDEO_SAA7127 - tristate "Philips SAA7127/9 digital video encoders" - depends on VIDEO_V4L2 && I2C && EXPERIMENTAL - ---help--- - Support for the Philips SAA7127/9 digital video encoders. +config VIDEO_PLANB + tristate "PlanB Video-In on PowerMac" + depends on PPC_PMAC && VIDEO_V4L1 && BROKEN + help + PlanB is the V4L driver for the PowerMac 7x00/8x00 series video + input hardware. If you want to experiment with this, say Y. + Otherwise, or if you don't understand a word, say N. See + for more info. + + Saying M will compile this driver as a module (planb). + +config VIDEO_BWQCAM + tristate "Quickcam BW Video For Linux" + depends on PARPORT && VIDEO_V4L1 + help + Say Y have if you the black and white version of the QuickCam + camera. See the next option for the color version. To compile this driver as a module, choose M here: the - module will be called saa7127. + module will be called bw-qcam. + +config VIDEO_CQCAM + tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)" + depends on EXPERIMENTAL && PARPORT && VIDEO_V4L1 + help + This is the video4linux driver for the colour version of the + Connectix QuickCam. If you have one of these cameras, say Y here, + otherwise say N. This driver does not work with the original + monochrome QuickCam, QuickCam VC or QuickClip. It is also available + as a module (c-qcam). + Read for more information. + +config VIDEO_W9966 + tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux" + depends on PARPORT_1284 && PARPORT && VIDEO_V4L1 + help + Video4linux driver for Winbond's w9966 based Webcams. + Currently tested with the LifeView FlyCam Supra. + If you have one of these cameras, say Y here + otherwise say N. + This driver is also available as a module (w9966). + + Check out for more + information. + +config VIDEO_CPIA + tristate "CPiA Video For Linux" + depends on VIDEO_V4L1 + ---help--- + This is the video4linux driver for cameras based on Vision's CPiA + (Colour Processor Interface ASIC), such as the Creative Labs Video + Blaster Webcam II. If you have one of these cameras, say Y here + and select parallel port and/or USB lowlevel support below, + otherwise say N. This will not work with the Creative Webcam III. + + Please read for more + information. + + This driver is also available as a module (cpia). + +config VIDEO_CPIA_PP + tristate "CPiA Parallel Port Lowlevel Support" + depends on PARPORT_1284 && VIDEO_CPIA && PARPORT + help + This is the lowlevel parallel port support for cameras based on + Vision's CPiA (Colour Processor Interface ASIC), such as the + Creative Webcam II. If you have the parallel port version of one + of these cameras, say Y here, otherwise say N. It is also available + as a module (cpia_pp). + +config VIDEO_CPIA_USB + tristate "CPiA USB Lowlevel Support" + depends on VIDEO_CPIA && USB + help + This is the lowlevel USB support for cameras based on Vision's CPiA + (Colour Processor Interface ASIC), such as the Creative Webcam II. + If you have the USB version of one of these cameras, say Y here, + otherwise say N. This will not work with the Creative Webcam III. + It is also available as a module (cpia_usb). + +source "drivers/media/video/cpia2/Kconfig" -config VIDEO_SAA7185 - tristate "Philips SAA7185 video encoder" - depends on VIDEO_DEV && I2C - ---help--- - Support for the Philips SAA7185 video encoder. +config VIDEO_SAA5246A + tristate "SAA5246A, SAA5281 Teletext processor" + depends on I2C && VIDEO_V4L2 + help + Support for I2C bus based teletext using the SAA5246A or SAA5281 + chip. Useful only if you live in Europe. To compile this driver as a module, choose M here: the - module will be called saa7185. + module will be called saa5246a. -config VIDEO_ADV7170 - tristate "Analog Devices ADV7170 video encoder driver" - depends on VIDEO_V4L2 && I2C - ---help--- - Support for the Analog Devices ADV7170 video encoder driver +config VIDEO_SAA5249 + tristate "SAA5249 Teletext processor" + depends on VIDEO_DEV && I2C && VIDEO_V4L2 + help + Support for I2C bus based teletext using the SAA5249 chip. At the + moment this is only useful on some European WinTV cards. To compile this driver as a module, choose M here: the - module will be called adv7170. + module will be called saa5249. -config VIDEO_ADV7175 - tristate "Analog Devices ADV7175 video encoder driver" - depends on VIDEO_V4L2 && I2C - ---help--- - Support for the Analog Devices ADV7175 video encoder driver +config TUNER_3036 + tristate "SAB3036 tuner" + depends on VIDEO_DEV && I2C && VIDEO_V4L1 + help + Say Y here to include support for Philips SAB3036 compatible tuners. + If in doubt, say N. - To compile this driver as a module, choose M here: the - module will be called adv7175. +config VIDEO_VINO + tristate "SGI Vino Video For Linux (EXPERIMENTAL)" + depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2 + select I2C_ALGO_SGI + select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO + help + Say Y here to build in support for the Vino video input system found + on SGI Indy machines. -comment "Video decoders" +config VIDEO_STRADIS + tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)" + depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && !PPC64 + help + Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video + driver for PCI. There is a product page at + . -config VIDEO_BT819 - tristate "BT819A VideoStream Decoder" - depends on VIDEO_DEV && I2C - ---help--- - Support for BT819A video decoder. +config VIDEO_ZORAN_ZR36060 + tristate + +config VIDEO_ZORAN + tristate "Zoran ZR36057/36067 Video For Linux" + depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64 + help + Say Y for support for MJPEG capture cards based on the Zoran + 36057/36067 PCI controller chipset. This includes the Iomega + Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is + a driver homepage at . For + more information, check . To compile this driver as a module, choose M here: the - module will be called bt819. + module will be called zr36067. -config VIDEO_BT856 - tristate "BT856 VideoStream Decoder" - depends on VIDEO_DEV && I2C - ---help--- - Support for BT856 video decoder. +config VIDEO_ZORAN_BUZ + tristate "Iomega Buz support" + depends on VIDEO_ZORAN + select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ZORAN_ZR36060 + help + Support for the Iomega Buz MJPEG capture/playback card. - To compile this driver as a module, choose M here: the - module will be called bt856. +config VIDEO_ZORAN_DC10 + tristate "Pinnacle/Miro DC10(+) support" + depends on VIDEO_ZORAN + select VIDEO_SAA7110 + select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ZORAN_ZR36060 + help + Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback + card. -config VIDEO_BT866 - tristate "BT866 VideoStream Decoder" - depends on VIDEO_DEV && I2C - ---help--- - Support for BT866 video decoder. +config VIDEO_ZORAN_DC30 + tristate "Pinnacle/Miro DC30(+) support" + depends on VIDEO_ZORAN + select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO + help + Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback + card. This also supports really old DC10 cards based on the + zr36050 MJPEG codec and zr36016 VFE. - To compile this driver as a module, choose M here: the - module will be called bt866. +config VIDEO_ZORAN_LML33 + tristate "Linux Media Labs LML33 support" + depends on VIDEO_ZORAN + select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ZORAN_ZR36060 + help + Support for the Linux Media Labs LML33 MJPEG capture/playback + card. -config VIDEO_SAA7110 - tristate "Philips SAA7110 video decoder" - depends on VIDEO_DEV - ---help--- - Support for the Philips SAA7110 video decoders. +config VIDEO_ZORAN_LML33R10 + tristate "Linux Media Labs LML33R10 support" + depends on VIDEO_ZORAN + select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ZORAN_ZR36060 + help + support for the Linux Media Labs LML33R10 MJPEG capture/playback + card. - To compile this driver as a module, choose M here: the - module will be called saa7110. +config VIDEO_ZORAN_AVS6EYES + tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" + depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1 + select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ZORAN_ZR36060 + help + Support for the AverMedia 6 Eyes video surveillance card. -config VIDEO_SAA7111 - tristate "Philips SAA7111 video decoder" - depends on VIDEO_DEV && I2C - ---help--- - Support for the Philips SAA711 video decoder. +config VIDEO_ZR36120 + tristate "Zoran ZR36120/36125 Video For Linux" + depends on PCI && I2C && VIDEO_V4L1 && BROKEN + help + Support for ZR36120/ZR36125 based frame grabber/overlay boards. + This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV, + and Buster boards. Please read the material in + for more information. To compile this driver as a module, choose M here: the - module will be called saa7111. + module will be called zr36120. -config VIDEO_SAA7114 - tristate "Philips SAA7114 video decoder" - depends on VIDEO_DEV && I2C +config VIDEO_MEYE + tristate "Sony Vaio Picturebook Motion Eye Video For Linux" + depends on PCI && SONYPI && VIDEO_V4L1 ---help--- - Support for the Philips SAA7114 video decoder. This driver - is used only on Zoran driver and should be moved soon to - SAA711x module. + This is the video4linux driver for the Motion Eye camera found + in the Vaio Picturebook laptops. Please read the material in + for more information. + + If you say Y or M here, you need to say Y or M to "Sony Programmable + I/O Control Device" in the character device section. To compile this driver as a module, choose M here: the - module will be called saa7114. + module will be called meye. -config VIDEO_SAA711X - tristate "Philips SAA7113/4/5 video decoders" - depends on VIDEO_DEV && I2C && EXPERIMENTAL +source "drivers/media/video/saa7134/Kconfig" + +config VIDEO_MXB + tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" + depends on PCI && VIDEO_V4L1 + select VIDEO_SAA7146_VV + select VIDEO_TUNER + select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO ---help--- - Support for the Philips SAA7113/4/5 video decoders. + This is a video4linux driver for the 'Multimedia eXtension Board' + TV card by Siemens-Nixdorf. To compile this driver as a module, choose M here: the - module will be called saa7115. + module will be called mxb. -config VIDEO_SAA7191 - tristate "Philips SAA7191 video decoder" - depends on VIDEO_DEV && I2C +config VIDEO_DPC + tristate "Philips-Semiconductors 'dpc7146 demonstration board'" + depends on PCI && VIDEO_V4L1 + select VIDEO_SAA7146_VV + select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO ---help--- - Support for the Philips SAA7191 video decoder. + This is a video4linux driver for the 'dpc7146 demonstration + board' by Philips-Semiconductors. It's the reference design + for SAA7146 bases boards, so if you have some unsupported + saa7146 based, analog video card, chances are good that it + will work with this skeleton driver. To compile this driver as a module, choose M here: the - module will be called saa7191. + module will be called dpc7146. -config VIDEO_TVP5150 - tristate "Texas Instruments TVP5150 video decoder" - depends on VIDEO_DEV && I2C +config VIDEO_HEXIUM_ORION + tristate "Hexium HV-PCI6 and Orion frame grabber" + depends on PCI && VIDEO_V4L2 + select VIDEO_SAA7146_VV ---help--- - Support for the Texas Instruments TVP5150 video decoder. + This is a video4linux driver for the Hexium HV-PCI6 and + Orion frame grabber cards by Hexium. To compile this driver as a module, choose M here: the - module will be called tvp5150. + module will be called hexium_orion. -config VIDEO_VPX3220 - tristate "vpx3220a, vpx3216b & vpx3214c video decoder driver" - depends on VIDEO_DEV && I2C +config VIDEO_HEXIUM_GEMINI + tristate "Hexium Gemini frame grabber" + depends on PCI && VIDEO_V4L2 + select VIDEO_SAA7146_VV ---help--- - Support for VPX322x video decoders. + This is a video4linux driver for the Hexium Gemini frame + grabber card by Hexium. Please note that the Gemini Dual + card is *not* fully supported. To compile this driver as a module, choose M here: the - module will be called vpx3220. + module will be called hexium_gemini. -comment "Video improvement chips" +source "drivers/media/video/cx88/Kconfig" -config VIDEO_UPD64031A - tristate "NEC Electronics uPD64031A Ghost Reduction" - depends on VIDEO_V4L2 && I2C && EXPERIMENTAL +config VIDEO_M32R_AR + tristate "AR devices" + depends on M32R && VIDEO_V4L1 ---help--- - Support for the NEC Electronics uPD64031A Ghost Reduction - video chip. It is most often found in NTSC TV cards made for - Japan and is used to reduce the 'ghosting' effect that can - be present in analog TV broadcasts. - - To compile this driver as a module, choose M here: the - module will be called upd64031a. + This is a video4linux driver for the Renesas AR (Artificial Retina) + camera module. -config VIDEO_UPD64083 - tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation" - depends on VIDEO_V4L2 && I2C && EXPERIMENTAL +config VIDEO_M32R_AR_M64278 + tristate "AR device with color module M64278(VGA)" + depends on PLAT_M32700UT + select VIDEO_M32R_AR ---help--- - Support for the NEC Electronics uPD64083 3-Dimensional Y/C - separation video chip. It is used to improve the quality of - the colors of a composite signal. + This is a video4linux driver for the Renesas AR (Artificial + Retina) with M64278E-800 camera module. + This module supports VGA(640x480 pixels) resolutions. To compile this driver as a module, choose M here: the - module will be called upd64083. - -endmenu # encoder / decoder chips + module will be called arv. # # USB Multimedia device configuration diff --git a/linux/drivers/media/video/bt8xx/Kconfig b/linux/drivers/media/video/bt8xx/Kconfig index 7eb83d9f6..58eae887a 100644 --- a/linux/drivers/media/video/bt8xx/Kconfig +++ b/linux/drivers/media/video/bt8xx/Kconfig @@ -8,10 +8,10 @@ config VIDEO_BT848 select VIDEO_IR select VIDEO_TUNER select VIDEO_TVEEPROM - select VIDEO_MSP3400 - select VIDEO_TVAUDIO - select VIDEO_TDA7432 - select VIDEO_TDA9875 + select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TDA7432 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TDA9875 if VIDEO_HELPER_CHIPS_AUTO ---help--- Support for BT848 based frame grabber/overlay boards. This includes the Miro, Hauppauge and STB boards. Please read the material in diff --git a/linux/drivers/media/video/em28xx/Kconfig b/linux/drivers/media/video/em28xx/Kconfig index 538d0fd5d..9285a58e4 100644 --- a/linux/drivers/media/video/em28xx/Kconfig +++ b/linux/drivers/media/video/em28xx/Kconfig @@ -5,8 +5,8 @@ config VIDEO_EM28XX select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_IR - select VIDEO_SAA711X - select VIDEO_TVP5150 + select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO ---help--- This is a video4linux driver for Empia 28xx based TV cards. diff --git a/linux/drivers/media/video/pvrusb2/Kconfig b/linux/drivers/media/video/pvrusb2/Kconfig index 7e727fe14..a52171ef6 100644 --- a/linux/drivers/media/video/pvrusb2/Kconfig +++ b/linux/drivers/media/video/pvrusb2/Kconfig @@ -5,8 +5,6 @@ config VIDEO_PVRUSB2 select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_CX2341X - select VIDEO_SAA711X - select VIDEO_MSP3400 ---help--- This is a video4linux driver for Conexant 23416 based usb2 personal video recorder devices. @@ -14,6 +12,20 @@ config VIDEO_PVRUSB2 To compile this driver as a module, choose M here: the module will be called pvrusb2 +config VIDEO_PVRUSB2_29XXX + bool "Hauppauge WinTV-PVR USB2 support for 29xxx model series" + depends on VIDEO_PVRUSB2 && EXPERIMENTAL + select VIDEO_SAA711X + select VIDEO_MSP3400 + ---help--- + This option enables support for WinTV-PVR USB2 devices whose + model number is of the form "29xxx" (leading prefix of "29" + followed by 3 digits). + To see if you may need this option, examine the white + sticker on the underside of your device. + + If you are in doubt, say Y. + config VIDEO_PVRUSB2_24XXX bool "Hauppauge WinTV-PVR USB2 support for 24xxx model series" depends on VIDEO_PVRUSB2 && EXPERIMENTAL @@ -60,3 +72,5 @@ config VIDEO_PVRUSB2_DEBUGIFC You do not need to select this option unless you plan on debugging the driver or performing a manual firmware extraction. + + If you are in doubt, say N. -- cgit v1.2.3 From df7e54a424a041e994e12a5dd7e7c577de34142a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 23 Aug 2006 10:08:41 -0300 Subject: Fixes Helper module dependencies against V4L APIs From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/Kconfig | 44 +++++++++++++++---------------- linux/drivers/media/video/cx25840/Kconfig | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 9d2f3715b..4cdc058ae 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -40,10 +40,10 @@ comment "Audio Decoders" config VIDEO_TVAUDIO tristate "Simple audio decoder chips" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for several audio decoder chips found on some bt8xx boards: - Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300, + Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300, tea6320, tea6420, tda8425, ta8874z. Microchip: pic16c54 based design on ProVideo PV951 board. @@ -52,7 +52,7 @@ config VIDEO_TVAUDIO config VIDEO_TDA7432 tristate "Philips TDA7432 audio processor chip" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for tda7432 audio decoder chip found on some bt8xx boards. @@ -70,7 +70,7 @@ config VIDEO_TDA9840 config VIDEO_TDA9875 tristate "Philips TDA9875 audio processor chip" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for tda9875 audio decoder chip found on some bt8xx boards. @@ -97,7 +97,7 @@ config VIDEO_TEA6420 config VIDEO_MSP3400 tristate "Micronas MSP34xx audio decoders" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L2 && I2C ---help--- Support for the Micronas MSP34xx series of audio decoders. @@ -106,7 +106,7 @@ config VIDEO_MSP3400 config VIDEO_CS53L32A tristate "Cirrus Logic CS53L32A audio ADC" - depends on VIDEO_DEV && I2C && EXPERIMENTAL + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- Support for the Cirrus Logic CS53L32A low voltage stereo A/D converter. @@ -116,7 +116,7 @@ config VIDEO_CS53L32A config VIDEO_TLV320AIC23B tristate "Texas Instruments TLV320AIC23B audio codec" - depends on VIDEO_DEV && I2C && EXPERIMENTAL + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- Support for the Texas Instruments TLV320AIC23B audio codec. @@ -125,7 +125,7 @@ config VIDEO_TLV320AIC23B config VIDEO_WM8775 tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer" - depends on VIDEO_DEV && I2C && EXPERIMENTAL + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- Support for the Wolfson Microelectronics WM8775 high performance stereo A/D Converter with a 4 channel input mixer. @@ -135,7 +135,7 @@ config VIDEO_WM8775 config VIDEO_WM8739 tristate "Wolfson Microelectronics WM8739 stereo audio ADC" - depends on VIDEO_DEV && I2C && EXPERIMENTAL + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- Support for the Wolfson Microelectronics WM8739 stereo A/D Converter. @@ -172,7 +172,7 @@ config VIDEO_SAA7127 config VIDEO_SAA7185 tristate "Philips SAA7185 video encoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for the Philips SAA7185 video encoder. @@ -181,7 +181,7 @@ config VIDEO_SAA7185 config VIDEO_ADV7170 tristate "Analog Devices ADV7170 video encoder driver" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for the Analog Devices ADV7170 video encoder driver @@ -190,7 +190,7 @@ config VIDEO_ADV7170 config VIDEO_ADV7175 tristate "Analog Devices ADV7175 video encoder driver" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for the Analog Devices ADV7175 video encoder driver @@ -201,7 +201,7 @@ comment "Video decoders" config VIDEO_BT819 tristate "BT819A VideoStream Decoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for BT819A video decoder. @@ -210,7 +210,7 @@ config VIDEO_BT819 config VIDEO_BT856 tristate "BT856 VideoStream Decoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for BT856 video decoder. @@ -219,7 +219,7 @@ config VIDEO_BT856 config VIDEO_BT866 tristate "BT866 VideoStream Decoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for BT866 video decoder. @@ -228,7 +228,7 @@ config VIDEO_BT866 config VIDEO_SAA7110 tristate "Philips SAA7110 video decoder" - depends on VIDEO_DEV + depends on VIDEO_V4L1 ---help--- Support for the Philips SAA7110 video decoders. @@ -237,7 +237,7 @@ config VIDEO_SAA7110 config VIDEO_SAA7111 tristate "Philips SAA7111 video decoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for the Philips SAA711 video decoder. @@ -246,7 +246,7 @@ config VIDEO_SAA7111 config VIDEO_SAA7114 tristate "Philips SAA7114 video decoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for the Philips SAA7114 video decoder. This driver is used only on Zoran driver and should be moved soon to @@ -257,7 +257,7 @@ config VIDEO_SAA7114 config VIDEO_SAA711X tristate "Philips SAA7113/4/5 video decoders" - depends on VIDEO_DEV && I2C && EXPERIMENTAL + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL ---help--- Support for the Philips SAA7113/4/5 video decoders. @@ -266,7 +266,7 @@ config VIDEO_SAA711X config VIDEO_SAA7191 tristate "Philips SAA7191 video decoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for the Philips SAA7191 video decoder. @@ -275,7 +275,7 @@ config VIDEO_SAA7191 config VIDEO_TVP5150 tristate "Texas Instruments TVP5150 video decoder" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L2 && I2C ---help--- Support for the Texas Instruments TVP5150 video decoder. @@ -284,7 +284,7 @@ config VIDEO_TVP5150 config VIDEO_VPX3220 tristate "vpx3220a, vpx3216b & vpx3214c video decoder driver" - depends on VIDEO_DEV && I2C + depends on VIDEO_V4L1 && I2C ---help--- Support for VPX322x video decoders. diff --git a/linux/drivers/media/video/cx25840/Kconfig b/linux/drivers/media/video/cx25840/Kconfig index 854264e42..7cf29a03e 100644 --- a/linux/drivers/media/video/cx25840/Kconfig +++ b/linux/drivers/media/video/cx25840/Kconfig @@ -1,6 +1,6 @@ config VIDEO_CX25840 tristate "Conexant CX2584x audio/video decoders" - depends on VIDEO_DEV && I2C && EXPERIMENTAL + depends on VIDEO_V4L2 && I2C && EXPERIMENTAL select FW_LOADER ---help--- Support for the Conexant CX2584x audio/video decoders. -- cgit v1.2.3 From ed97b0da67163cb14799b2b512a4e76d95ad2e7f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 23 Aug 2006 11:17:30 -0300 Subject: Fix an error when loading bttv driver on PV M4900. From: Mauro Carvalho Chehab Previously, this were reported: Ooops: IR config error [card=139] Thanks-to: Hermann Pitton for the solution. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/bt8xx/bttv-input.c | 1 + 1 file changed, 1 insertion(+) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c index ce5ce470a..43bc6805b 100644 --- a/linux/drivers/media/video/bt8xx/bttv-input.c +++ b/linux/drivers/media/video/bt8xx/bttv-input.c @@ -304,6 +304,7 @@ int bttv_input_init(struct bttv *btv) ir->mask_keyup = 0x010000; ir->polling = 50; // ms break; + case BTTV_BOARD_PV_M4900: case BTTV_BOARD_PV_BT878P_9B: case BTTV_BOARD_PV_BT878P_PLUS: ir_codes = ir_codes_pixelview; -- cgit v1.2.3 From 1f843421759ab9e7ac26c7522706581dde649d43 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 23 Aug 2006 16:51:43 -0300 Subject: Fix a warning caused by a typo (comma instead of dot-comma) From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/frontends/dibx000_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/dvb/frontends/dibx000_common.c b/linux/drivers/media/dvb/frontends/dibx000_common.c index bdc6d7a7d..1f6dc06a3 100644 --- a/linux/drivers/media/dvb/frontends/dibx000_common.c +++ b/linux/drivers/media/dvb/frontends/dibx000_common.c @@ -85,7 +85,7 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c struct i2c_msg m[2 + num]; u8 tx_open[4], tx_close[4]; - memset(m,0, sizeof(struct i2c_msg) * (2 + num)), + memset(m,0, sizeof(struct i2c_msg) * (2 + num)); dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER); -- cgit v1.2.3