From: Tony Lindgren Date: Tue, 4 Apr 2006 15:30:26 +0000 (-0700) Subject: Merge with /home/tmlind/src/kernel/linux-2.6 X-Git-Tag: v2.6.17-omap1~101^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8dd2a924d16ef2cb5918409ff61416a19f2a38a6;p=linux-2.6-omap-h63xx.git Merge with /home/tmlind/src/kernel/linux-2.6 --- 8dd2a924d16ef2cb5918409ff61416a19f2a38a6 diff --cc drivers/media/video/Kconfig index f33a35d207a,85888a8a93c..310cff30e73 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@@ -339,20 -316,180 +316,182 @@@ config VIDEO_M32R_AR_M6427 Say Y here to use the Renesas M64278E-800 camera module, which supports VGA(640x480 pixcels) size of images. - config VIDEO_AUDIO_DECODER - tristate "Add support for additional audio chipsets" + # + # Encoder / Decoder module configuration + # + + menu "Encoders and Decoders" + depends on VIDEO_DEV + + config VIDEO_MSP3400 + tristate "Micronas MSP34xx audio decoders" + depends on VIDEO_DEV && I2C + ---help--- + Support for the Micronas MSP34xx series of audio decoders. + + To compile this driver as a module, choose M here: the + module will be called msp3400. + + 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. + + To compile this driver as a module, choose M here: the + module will be called cs53l32a. + + 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 wm8775. + + config VIDEO_WM8739 + tristate "Wolfson Microelectronics WM8739 stereo audio ADC" + depends on VIDEO_DEV && I2C && EXPERIMENTAL + ---help--- + 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 wm8739. + + source "drivers/media/video/cx25840/Kconfig" + + config VIDEO_SAA711X + tristate "Philips SAA7113/4/5 video decoders" + depends on VIDEO_DEV && I2C && EXPERIMENTAL + ---help--- + Support for the Philips SAA7113/4/5 video decoders. + + To compile this driver as a module, choose M here: the + module will be called saa7115. + + config VIDEO_SAA7127 + tristate "Philips SAA7127/9 digital video encoders" + depends on VIDEO_DEV && 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. + + config VIDEO_UPD64031A + tristate "NEC Electronics uPD64031A Ghost Reduction" depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- - Say Y here to compile drivers for WM8775 and CS53L32A audio - decoders. + 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. - config VIDEO_DECODER - tristate "Add support for additional video chipsets" + To compile this driver as a module, choose M here: the + module will be called upd64031a. + + config VIDEO_UPD64083 + tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation" depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- - Say Y here to compile drivers for SAA7115, SAA7127 and CX25840 - video decoders. + 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 upd64083. + + endmenu # encoder / decoder chips + + # + # USB Multimedia device configuration + # + + menu "V4L USB devices" + depends on USB && VIDEO_DEV + + source "drivers/media/video/em28xx/Kconfig" + + config USB_DSBR + tristate "D-Link USB FM radio support (EXPERIMENTAL)" + depends on USB && VIDEO_DEV && EXPERIMENTAL + ---help--- + Say Y here if you want to connect this type of radio to your + computer's USB port. Note that the audio is not digital, and + you must connect the line out connector to a sound card or a + set of speakers. + + To compile this driver as a module, choose M here: the + module will be called dsbr100. + + source "drivers/media/video/usbvideo/Kconfig" + + source "drivers/media/video/et61x251/Kconfig" + + config USB_OV511 + tristate "USB OV511 Camera support" + depends on USB && VIDEO_DEV + ---help--- + Say Y here if you want to connect this type of camera to your + computer's USB port. See + for more information and for a list of supported cameras. + + To compile this driver as a module, choose M here: the + module will be called ov511. + + config USB_SE401 + tristate "USB SE401 Camera support" + depends on USB && VIDEO_DEV + ---help--- + Say Y here if you want to connect this type of camera to your + computer's USB port. See + for more information and for a list of supported cameras. + + To compile this driver as a module, choose M here: the + module will be called se401. + + source "drivers/media/video/sn9c102/Kconfig" + + config USB_STV680 + tristate "USB STV680 (Pencam) Camera support" + depends on USB && VIDEO_DEV + ---help--- + Say Y here if you want to connect this type of camera to your + computer's USB port. This includes the Pencam line of cameras. + See for more information + and for a list of supported cameras. + + To compile this driver as a module, choose M here: the + module will be called stv680. + + config USB_W9968CF + tristate "USB W996[87]CF JPEG Dual Mode Camera support" + depends on USB && VIDEO_DEV && I2C + select VIDEO_OVCAMCHIP + ---help--- + Say Y here if you want support for cameras based on OV681 or + Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. + + This driver has an optional plugin, which is distributed as a + separate module only (released under GPL). It allows to use higher + resolutions and framerates, but cannot be included in the official + Linux kernel for performance purposes. + + See for more info. + + To compile this driver as a module, choose M here: the + module will be called w9968cf. + + source "drivers/media/video/zc0301/Kconfig" + + source "drivers/media/video/pwc/Kconfig" + + endmenu # V4L USB devices +source drivers/media/video/omap/Kconfig + endmenu diff --cc drivers/media/video/Makefile index 93cfb54d2bb,4092a5e37ff..a01052e4743 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@@ -60,8 -61,27 +61,28 @@@ obj-$(CONFIG_VIDEO_BTCX) += btcx-risc. obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o +obj-$(CONFIG_VIDEO_OMAP_CAMERA) += omap/ - obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840/ saa7127.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_USB_DABUSB) += dabusb.o + obj-$(CONFIG_USB_DSBR) += dsbr100.o + obj-$(CONFIG_USB_OV511) += ov511.o + obj-$(CONFIG_USB_SE401) += se401.o + obj-$(CONFIG_USB_STV680) += stv680.o + obj-$(CONFIG_USB_W9968CF) += w9968cf.o + + obj-$(CONFIG_USB_SN9C102) += sn9c102/ + obj-$(CONFIG_USB_ET61X251) += et61x251/ + obj-$(CONFIG_USB_PWC) += pwc/ + obj-$(CONFIG_USB_ZC0301) += zc0301/ + + obj-$(CONFIG_USB_IBMCAM) += usbvideo/ + obj-$(CONFIG_USB_KONICAWC) += usbvideo/ + obj-$(CONFIG_USB_VICAM) += usbvideo/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core diff --cc include/linux/i2c-id.h index d1e86965eb7,c8b81f419fd..c930ba739af --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h @@@ -108,9 -108,11 +108,13 @@@ #define I2C_DRIVERID_UPD64083 78 /* upd64083 video processor */ #define I2C_DRIVERID_UPD64031A 79 /* upd64031a video processor */ #define I2C_DRIVERID_SAA717X 80 /* saa717x video encoder */ + #define I2C_DRIVERID_DS1672 81 /* Dallas/Maxim DS1672 RTC */ + #define I2C_DRIVERID_X1205 82 /* Xicor/Intersil X1205 RTC */ + #define I2C_DRIVERID_PCF8563 83 /* Philips PCF8563 RTC */ + #define I2C_DRIVERID_RS5C372 84 /* Ricoh RS5C372 RTC */ +#define I2C_DRIVERID_MISC 99 /* Whatever until sorted out */ + #define I2C_DRIVERID_I2CDEV 900 #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ #define I2C_DRIVERID_ALERT 903 /* SMBus Alert Responder Client */