]> Pileus Git - ~andy/linux/commitdiff
[media] move i2c files into drivers/media/i2c
authorMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 14 Aug 2012 19:23:43 +0000 (16:23 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 15 Aug 2012 19:42:14 +0000 (16:42 -0300)
Move ancillary I2C drivers into drivers/media/i2c, in order to
better organize them.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
124 files changed:
drivers/media/Kconfig
drivers/media/Makefile
drivers/media/i2c/Kconfig [new file with mode: 0644]
drivers/media/i2c/Makefile [new file with mode: 0644]
drivers/media/i2c/adp1653.c [moved from drivers/media/video/adp1653.c with 99% similarity]
drivers/media/i2c/adv7170.c [moved from drivers/media/video/adv7170.c with 100% similarity]
drivers/media/i2c/adv7175.c [moved from drivers/media/video/adv7175.c with 100% similarity]
drivers/media/i2c/adv7180.c [moved from drivers/media/video/adv7180.c with 100% similarity]
drivers/media/i2c/adv7183.c [moved from drivers/media/video/adv7183.c with 100% similarity]
drivers/media/i2c/adv7183_regs.h [moved from drivers/media/video/adv7183_regs.h with 100% similarity]
drivers/media/i2c/adv7343.c [moved from drivers/media/video/adv7343.c with 100% similarity]
drivers/media/i2c/adv7343_regs.h [moved from drivers/media/video/adv7343_regs.h with 100% similarity]
drivers/media/i2c/adv7393.c [moved from drivers/media/video/adv7393.c with 100% similarity]
drivers/media/i2c/adv7393_regs.h [moved from drivers/media/video/adv7393_regs.h with 100% similarity]
drivers/media/i2c/ak881x.c [moved from drivers/media/video/ak881x.c with 100% similarity]
drivers/media/i2c/aptina-pll.c [moved from drivers/media/video/aptina-pll.c with 100% similarity]
drivers/media/i2c/aptina-pll.h [moved from drivers/media/video/aptina-pll.h with 100% similarity]
drivers/media/i2c/as3645a.c [moved from drivers/media/video/as3645a.c with 99% similarity]
drivers/media/i2c/bt819.c [moved from drivers/media/video/bt819.c with 100% similarity]
drivers/media/i2c/bt856.c [moved from drivers/media/video/bt856.c with 100% similarity]
drivers/media/i2c/bt866.c [moved from drivers/media/video/bt866.c with 100% similarity]
drivers/media/i2c/btcx-risc.c [moved from drivers/media/video/btcx-risc.c with 100% similarity]
drivers/media/i2c/btcx-risc.h [moved from drivers/media/video/btcx-risc.h with 100% similarity]
drivers/media/i2c/cs5345.c [moved from drivers/media/video/cs5345.c with 100% similarity]
drivers/media/i2c/cs53l32a.c [moved from drivers/media/video/cs53l32a.c with 100% similarity]
drivers/media/i2c/cx2341x.c [moved from drivers/media/video/cx2341x.c with 100% similarity]
drivers/media/i2c/cx25840/Kconfig [moved from drivers/media/video/cx25840/Kconfig with 100% similarity]
drivers/media/i2c/cx25840/Makefile [moved from drivers/media/video/cx25840/Makefile with 80% similarity]
drivers/media/i2c/cx25840/cx25840-audio.c [moved from drivers/media/video/cx25840/cx25840-audio.c with 100% similarity]
drivers/media/i2c/cx25840/cx25840-core.c [moved from drivers/media/video/cx25840/cx25840-core.c with 100% similarity]
drivers/media/i2c/cx25840/cx25840-core.h [moved from drivers/media/video/cx25840/cx25840-core.h with 100% similarity]
drivers/media/i2c/cx25840/cx25840-firmware.c [moved from drivers/media/video/cx25840/cx25840-firmware.c with 100% similarity]
drivers/media/i2c/cx25840/cx25840-ir.c [moved from drivers/media/video/cx25840/cx25840-ir.c with 100% similarity]
drivers/media/i2c/cx25840/cx25840-vbi.c [moved from drivers/media/video/cx25840/cx25840-vbi.c with 100% similarity]
drivers/media/i2c/ir-kbd-i2c.c [moved from drivers/media/video/ir-kbd-i2c.c with 100% similarity]
drivers/media/i2c/ks0127.c [moved from drivers/media/video/ks0127.c with 100% similarity]
drivers/media/i2c/ks0127.h [moved from drivers/media/video/ks0127.h with 100% similarity]
drivers/media/i2c/m52790.c [moved from drivers/media/video/m52790.c with 100% similarity]
drivers/media/i2c/m5mols/Kconfig [moved from drivers/media/video/m5mols/Kconfig with 100% similarity]
drivers/media/i2c/m5mols/Makefile [moved from drivers/media/video/m5mols/Makefile with 100% similarity]
drivers/media/i2c/m5mols/m5mols.h [moved from drivers/media/video/m5mols/m5mols.h with 100% similarity]
drivers/media/i2c/m5mols/m5mols_capture.c [moved from drivers/media/video/m5mols/m5mols_capture.c with 100% similarity]
drivers/media/i2c/m5mols/m5mols_controls.c [moved from drivers/media/video/m5mols/m5mols_controls.c with 100% similarity]
drivers/media/i2c/m5mols/m5mols_core.c [moved from drivers/media/video/m5mols/m5mols_core.c with 100% similarity]
drivers/media/i2c/m5mols/m5mols_reg.h [moved from drivers/media/video/m5mols/m5mols_reg.h with 100% similarity]
drivers/media/i2c/msp3400-driver.c [moved from drivers/media/video/msp3400-driver.c with 100% similarity]
drivers/media/i2c/msp3400-driver.h [moved from drivers/media/video/msp3400-driver.h with 100% similarity]
drivers/media/i2c/msp3400-kthreads.c [moved from drivers/media/video/msp3400-kthreads.c with 100% similarity]
drivers/media/i2c/mt9m032.c [moved from drivers/media/video/mt9m032.c with 100% similarity]
drivers/media/i2c/mt9p031.c [moved from drivers/media/video/mt9p031.c with 100% similarity]
drivers/media/i2c/mt9t001.c [moved from drivers/media/video/mt9t001.c with 100% similarity]
drivers/media/i2c/mt9v011.c [moved from drivers/media/video/mt9v011.c with 100% similarity]
drivers/media/i2c/mt9v032.c [moved from drivers/media/video/mt9v032.c with 100% similarity]
drivers/media/i2c/noon010pc30.c [moved from drivers/media/video/noon010pc30.c with 100% similarity]
drivers/media/i2c/ov7670.c [moved from drivers/media/video/ov7670.c with 100% similarity]
drivers/media/i2c/s5k6aa.c [moved from drivers/media/video/s5k6aa.c with 100% similarity]
drivers/media/i2c/saa6588.c [moved from drivers/media/video/saa6588.c with 100% similarity]
drivers/media/i2c/saa7110.c [moved from drivers/media/video/saa7110.c with 100% similarity]
drivers/media/i2c/saa7115.c [moved from drivers/media/video/saa7115.c with 100% similarity]
drivers/media/i2c/saa711x_regs.h [moved from drivers/media/video/saa711x_regs.h with 100% similarity]
drivers/media/i2c/saa7127.c [moved from drivers/media/video/saa7127.c with 100% similarity]
drivers/media/i2c/saa717x.c [moved from drivers/media/video/saa717x.c with 100% similarity]
drivers/media/i2c/saa7185.c [moved from drivers/media/video/saa7185.c with 100% similarity]
drivers/media/i2c/saa7191.c [moved from drivers/media/video/saa7191.c with 100% similarity]
drivers/media/i2c/saa7191.h [moved from drivers/media/video/saa7191.h with 100% similarity]
drivers/media/i2c/smiapp-pll.c [moved from drivers/media/video/smiapp-pll.c with 99% similarity]
drivers/media/i2c/smiapp-pll.h [moved from drivers/media/video/smiapp-pll.h with 98% similarity]
drivers/media/i2c/smiapp/Kconfig [moved from drivers/media/video/smiapp/Kconfig with 100% similarity]
drivers/media/i2c/smiapp/Makefile [moved from drivers/media/video/smiapp/Makefile with 78% similarity]
drivers/media/i2c/smiapp/smiapp-core.c [moved from drivers/media/video/smiapp/smiapp-core.c with 99% similarity]
drivers/media/i2c/smiapp/smiapp-limits.c [moved from drivers/media/video/smiapp/smiapp-limits.c with 99% similarity]
drivers/media/i2c/smiapp/smiapp-limits.h [moved from drivers/media/video/smiapp/smiapp-limits.h with 99% similarity]
drivers/media/i2c/smiapp/smiapp-quirk.c [moved from drivers/media/video/smiapp/smiapp-quirk.c with 99% similarity]
drivers/media/i2c/smiapp/smiapp-quirk.h [moved from drivers/media/video/smiapp/smiapp-quirk.h with 98% similarity]
drivers/media/i2c/smiapp/smiapp-reg-defs.h [moved from drivers/media/video/smiapp/smiapp-reg-defs.h with 99% similarity]
drivers/media/i2c/smiapp/smiapp-reg.h [moved from drivers/media/video/smiapp/smiapp-reg.h with 98% similarity]
drivers/media/i2c/smiapp/smiapp-regs.c [moved from drivers/media/video/smiapp/smiapp-regs.c with 99% similarity]
drivers/media/i2c/smiapp/smiapp-regs.h [moved from drivers/media/video/smiapp/smiapp-regs.h with 100% similarity]
drivers/media/i2c/smiapp/smiapp.h [moved from drivers/media/video/smiapp/smiapp.h with 99% similarity]
drivers/media/i2c/sr030pc30.c [moved from drivers/media/video/sr030pc30.c with 100% similarity]
drivers/media/i2c/tcm825x.c [moved from drivers/media/video/tcm825x.c with 99% similarity]
drivers/media/i2c/tcm825x.h [moved from drivers/media/video/tcm825x.h with 99% similarity]
drivers/media/i2c/tda7432.c [moved from drivers/media/video/tda7432.c with 100% similarity]
drivers/media/i2c/tda9840.c [moved from drivers/media/video/tda9840.c with 100% similarity]
drivers/media/i2c/tea6415c.c [moved from drivers/media/video/tea6415c.c with 100% similarity]
drivers/media/i2c/tea6415c.h [moved from drivers/media/video/tea6415c.h with 100% similarity]
drivers/media/i2c/tea6420.c [moved from drivers/media/video/tea6420.c with 100% similarity]
drivers/media/i2c/tea6420.h [moved from drivers/media/video/tea6420.h with 100% similarity]
drivers/media/i2c/ths7303.c [moved from drivers/media/video/ths7303.c with 100% similarity]
drivers/media/i2c/tlv320aic23b.c [moved from drivers/media/video/tlv320aic23b.c with 100% similarity]
drivers/media/i2c/tvaudio.c [moved from drivers/media/video/tvaudio.c with 100% similarity]
drivers/media/i2c/tveeprom.c [moved from drivers/media/video/tveeprom.c with 100% similarity]
drivers/media/i2c/tvp514x.c [moved from drivers/media/video/tvp514x.c with 99% similarity]
drivers/media/i2c/tvp514x_regs.h [moved from drivers/media/video/tvp514x_regs.h with 99% similarity]
drivers/media/i2c/tvp5150.c [moved from drivers/media/video/tvp5150.c with 100% similarity]
drivers/media/i2c/tvp5150_reg.h [moved from drivers/media/video/tvp5150_reg.h with 100% similarity]
drivers/media/i2c/tvp7002.c [moved from drivers/media/video/tvp7002.c with 100% similarity]
drivers/media/i2c/tvp7002_reg.h [moved from drivers/media/video/tvp7002_reg.h with 100% similarity]
drivers/media/i2c/upd64031a.c [moved from drivers/media/video/upd64031a.c with 100% similarity]
drivers/media/i2c/upd64083.c [moved from drivers/media/video/upd64083.c with 100% similarity]
drivers/media/i2c/vp27smpx.c [moved from drivers/media/video/vp27smpx.c with 100% similarity]
drivers/media/i2c/vpx3220.c [moved from drivers/media/video/vpx3220.c with 100% similarity]
drivers/media/i2c/vs6624.c [moved from drivers/media/video/vs6624.c with 100% similarity]
drivers/media/i2c/vs6624_regs.h [moved from drivers/media/video/vs6624_regs.h with 100% similarity]
drivers/media/i2c/wm8739.c [moved from drivers/media/video/wm8739.c with 100% similarity]
drivers/media/i2c/wm8775.c [moved from drivers/media/video/wm8775.c with 100% similarity]
drivers/media/pci/bt8xx/Makefile
drivers/media/pci/cx23885/Makefile
drivers/media/pci/cx25821/Makefile
drivers/media/pci/cx88/Makefile
drivers/media/pci/ivtv/Makefile
drivers/media/pci/saa7134/Makefile
drivers/media/pci/saa7146/Makefile
drivers/media/pci/saa7164/Makefile
drivers/media/usb/cx231xx/Makefile
drivers/media/usb/em28xx/Makefile
drivers/media/usb/hdpvr/Makefile
drivers/media/usb/pvrusb2/Makefile
drivers/media/usb/stk1160/Makefile
drivers/media/usb/tlg2300/Makefile
drivers/media/usb/tm6000/Makefile
drivers/media/usb/usbvision/Makefile
drivers/media/video/Kconfig
drivers/media/video/Makefile

index c9cdc61e8b514f58727ca09ea8b25f61dd44abac..26f3de57a97141373f6cffc3c8a17a5c147d3fae 100644 (file)
@@ -151,18 +151,15 @@ source "drivers/media/rc/Kconfig"
 
 source "drivers/media/tuners/Kconfig"
 
+source "drivers/media/i2c/Kconfig"
+
 #
-# Video/Radio/Hybrid adapters
+# V4L platform/mem2mem drivers
 #
-
 source "drivers/media/video/Kconfig"
 
 source "drivers/media/radio/Kconfig"
 
-#
-# DVB adapters
-#
-
 source "drivers/media/pci/Kconfig"
 source "drivers/media/usb/Kconfig"
 source "drivers/media/mmc/Kconfig"
index 360c44dec3e428942c702acac6479e74f4a6faa3..e1be19615861909aea4c1d6c42f25c1961187b47 100644 (file)
@@ -9,7 +9,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
 endif
 
 obj-y += tuners/ common/ rc/ video/
-obj-y += pci/ usb/ mmc/ firewire/ parport/
+obj-y += i2c/ pci/ usb/ mmc/ firewire/ parport/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/ v4l2-core/
 obj-$(CONFIG_DVB_CORE)  += dvb-core/ dvb-frontends/
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
new file mode 100644 (file)
index 0000000..1c677f5
--- /dev/null
@@ -0,0 +1,566 @@
+#
+# Generic video config states
+#
+
+config VIDEO_BTCX
+       depends on PCI
+       tristate
+
+config VIDEO_TVEEPROM
+       tristate
+       depends on I2C
+
+#
+# Multimedia Video device configuration
+#
+
+if VIDEO_V4L2
+
+config VIDEO_HELPER_CHIPS_AUTO
+       bool "Autoselect pertinent encoders/decoders and other helper chips"
+       default y if !EXPERT
+       ---help---
+         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.
+
+         Unselect this only if you know exactly what you are doing, since
+         it may break support on some boards.
+
+         In doubt, say Y.
+
+config VIDEO_IR_I2C
+       tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
+       depends on I2C && RC_CORE
+       default y
+       ---help---
+         Most boards have an IR chip directly connected via GPIO. However,
+         some video boards have the IR connected via I2C bus.
+
+         If your board doesn't have an I2C IR chip, you may disable this
+         option.
+
+         In doubt, say Y.
+
+#
+# Encoder / Decoder module configuration
+#
+
+menu "Encoders, decoders, sensors and other helper chips"
+       visible if !VIDEO_HELPER_CHIPS_AUTO
+
+comment "Audio decoders, processors and mixers"
+
+config VIDEO_TVAUDIO
+       tristate "Simple audio decoder chips"
+       depends on VIDEO_V4L2 && 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 tvaudio.
+
+config VIDEO_TDA7432
+       tristate "Philips TDA7432 audio processor"
+       depends on VIDEO_V4L2 && 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_TDA9840
+       tristate "Philips TDA9840 audio processor"
+       depends on 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_TEA6415C
+       tristate "Philips TEA6415C audio processor"
+       depends on 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 "Philips TEA6420 audio processor"
+       depends on 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_V4L2 && 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_CS5345
+       tristate "Cirrus Logic CS5345 audio ADC"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Cirrus Logic CS5345 24-bit, 192 kHz
+         stereo A/D converter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cs5345.
+
+config VIDEO_CS53L32A
+       tristate "Cirrus Logic CS53L32A audio ADC"
+       depends on VIDEO_V4L2 && I2C
+       ---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_TLV320AIC23B
+       tristate "Texas Instruments TLV320AIC23B audio codec"
+       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       ---help---
+         Support for the Texas Instruments TLV320AIC23B audio codec.
+
+         To compile this driver as a module, choose M here: the
+         module will be called tlv320aic23b.
+
+config VIDEO_WM8775
+       tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"
+       depends on VIDEO_V4L2 && I2C
+       ---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_V4L2 && I2C
+       ---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.
+
+config VIDEO_VP27SMPX
+       tristate "Panasonic VP27s internal MPX"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the internal MPX of the Panasonic VP27s tuner.
+
+         To compile this driver as a module, choose M here: the
+         module will be called vp27smpx.
+
+comment "RDS decoders"
+
+config VIDEO_SAA6588
+       tristate "SAA6588 Radio Chip RDS decoder support"
+       depends on VIDEO_V4L2 && I2C
+
+       help
+         Support for this Radio Data System (RDS) decoder. This allows
+         seeing radio station identification transmitted using this
+         standard.
+
+         To compile this driver as a module, choose M here: the
+         module will be called saa6588.
+
+comment "Video decoders"
+
+config VIDEO_ADV7180
+       tristate "Analog Devices ADV7180 decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Analog Devices ADV7180 video decoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adv7180.
+
+config VIDEO_ADV7183
+       tristate "Analog Devices ADV7183 decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         V4l2 subdevice driver for the Analog Devices
+         ADV7183 video decoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adv7183.
+
+config VIDEO_BT819
+       tristate "BT819A VideoStream decoder"
+       depends on VIDEO_V4L2 && 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_V4L2 && 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_V4L2 && 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_KS0127
+       tristate "KS0127 video decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for KS0127 video decoder.
+
+         This chip is used on AverMedia AVS6EYES Zoran-based MJPEG
+         cards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ks0127.
+
+config VIDEO_SAA7110
+       tristate "Philips SAA7110 video decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---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_SAA711X
+       tristate "Philips SAA7111/3/4/5 video decoders"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Philips SAA7111/3/4/5 video decoders.
+
+         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_V4L2 && 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_TVP514X
+       tristate "Texas Instruments TVP514x video decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the TI TVP5146/47
+         decoder. It is currently working with the TI OMAP3 camera
+         controller.
+
+         To compile this driver as a module, choose M here: the
+         module will be called tvp514x.
+
+config VIDEO_TVP5150
+       tristate "Texas Instruments TVP5150 video decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Texas Instruments TVP5150 video decoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called tvp5150.
+
+config VIDEO_TVP7002
+       tristate "Texas Instruments TVP7002 video decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Texas Instruments TVP7002 video decoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called tvp7002.
+
+config VIDEO_VPX3220
+       tristate "vpx3220a, vpx3216b & vpx3214c video decoders"
+       depends on VIDEO_V4L2 && 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 and audio decoders"
+
+config VIDEO_SAA717X
+       tristate "Philips SAA7171/3/4 audio/video decoders"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Philips SAA7171/3/4 audio/video decoders.
+
+         To compile this driver as a module, choose M here: the
+         module will be called saa717x.
+
+source "drivers/media/i2c/cx25840/Kconfig"
+
+comment "MPEG video encoders"
+
+config VIDEO_CX2341X
+       tristate "Conexant CX2341x MPEG encoders"
+       depends on VIDEO_V4L2 && VIDEO_V4L2_COMMON
+       ---help---
+         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 cx2341x.
+
+comment "Video encoders"
+
+config VIDEO_SAA7127
+       tristate "Philips SAA7127/9 digital video encoders"
+       depends on VIDEO_V4L2 && I2C
+       ---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_SAA7185
+       tristate "Philips SAA7185 video encoder"
+       depends on VIDEO_V4L2 && 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"
+       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"
+       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.
+
+config VIDEO_ADV7343
+       tristate "ADV7343 video encoder"
+       depends on I2C
+       help
+         Support for Analog Devices I2C bus based ADV7343 encoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adv7343.
+
+config VIDEO_ADV7393
+       tristate "ADV7393 video encoder"
+       depends on I2C
+       help
+         Support for Analog Devices I2C bus based ADV7393 encoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adv7393.
+
+config VIDEO_AK881X
+       tristate "AK8813/AK8814 video encoders"
+       depends on I2C
+       help
+         Video output driver for AKM AK8813 and AK8814 TV encoders
+
+comment "Camera sensor devices"
+
+config VIDEO_APTINA_PLL
+       tristate
+
+config VIDEO_SMIAPP_PLL
+       tristate
+
+config VIDEO_OV7670
+       tristate "OmniVision OV7670 sensor support"
+       depends on I2C && VIDEO_V4L2
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the OmniVision
+         OV7670 VGA camera.  It currently only works with the M88ALP01
+         controller.
+
+config VIDEO_VS6624
+       tristate "ST VS6624 sensor support"
+       depends on VIDEO_V4L2 && I2C
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the ST VS6624
+         camera.
+
+         To compile this driver as a module, choose M here: the
+         module will be called vs6624.
+
+config VIDEO_MT9M032
+       tristate "MT9M032 camera sensor support"
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+       depends on MEDIA_CAMERA_SUPPORT
+       select VIDEO_APTINA_PLL
+       ---help---
+         This driver supports MT9M032 camera sensors from Aptina, monochrome
+         models only.
+
+config VIDEO_MT9P031
+       tristate "Aptina MT9P031 support"
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+       depends on MEDIA_CAMERA_SUPPORT
+       select VIDEO_APTINA_PLL
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the Aptina
+         (Micron) mt9p031 5 Mpixel camera.
+
+config VIDEO_MT9T001
+       tristate "Aptina MT9T001 support"
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the Aptina
+         (Micron) mt0t001 3 Mpixel camera.
+
+config VIDEO_MT9V011
+       tristate "Micron mt9v011 sensor support"
+       depends on I2C && VIDEO_V4L2
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the Micron
+         mt0v011 1.3 Mpixel camera.  It currently only works with the
+         em28xx driver.
+
+config VIDEO_MT9V032
+       tristate "Micron MT9V032 sensor support"
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the Micron
+         MT9V032 752x480 CMOS sensor.
+
+config VIDEO_TCM825X
+       tristate "TCM825x camera sensor support"
+       depends on I2C && VIDEO_V4L2
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a driver for the Toshiba TCM825x VGA camera sensor.
+         It is used for example in Nokia N800.
+
+config VIDEO_SR030PC30
+       tristate "Siliconfile SR030PC30 sensor support"
+       depends on I2C && VIDEO_V4L2
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This driver supports SR030PC30 VGA camera from Siliconfile
+
+config VIDEO_NOON010PC30
+       tristate "Siliconfile NOON010PC30 sensor support"
+       depends on I2C && VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_SUBDEV_API
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This driver supports NOON010PC30 CIF camera from Siliconfile
+
+source "drivers/media/i2c/m5mols/Kconfig"
+
+config VIDEO_S5K6AA
+       tristate "Samsung S5K6AAFX sensor support"
+       depends on MEDIA_CAMERA_SUPPORT
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+       ---help---
+         This is a V4L2 sensor-level driver for Samsung S5K6AA(FX) 1.3M
+         camera sensor with an embedded SoC image signal processor.
+
+source "drivers/media/i2c/smiapp/Kconfig"
+
+comment "Flash devices"
+
+config VIDEO_ADP1653
+       tristate "ADP1653 flash support"
+       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a driver for the ADP1653 flash controller. It is used for
+         example in Nokia N900.
+
+config VIDEO_AS3645A
+       tristate "AS3645A flash driver support"
+       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
+       depends on MEDIA_CAMERA_SUPPORT
+       ---help---
+         This is a driver for the AS3645A and LM3555 flash controllers. It has
+         build in control for flash, torch and indicator LEDs.
+
+comment "Video improvement chips"
+
+config VIDEO_UPD64031A
+       tristate "NEC Electronics uPD64031A Ghost Reduction"
+       depends on VIDEO_V4L2 && I2C
+       ---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.
+
+config VIDEO_UPD64083
+       tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
+       depends on VIDEO_V4L2 && I2C
+       ---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.
+
+         To compile this driver as a module, choose M here: the
+         module will be called upd64083.
+
+comment "Miscelaneous helper chips"
+
+config VIDEO_THS7303
+       tristate "THS7303 Video Amplifier"
+       depends on I2C
+       help
+         Support for TI THS7303 video amplifier
+
+         To compile this driver as a module, choose M here: the
+         module will be called ths7303.
+
+config VIDEO_M52790
+       tristate "Mitsubishi M52790 A/V switch"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+        Support for the Mitsubishi M52790 A/V switch.
+
+        To compile this driver as a module, choose M here: the
+        module will be called m52790.
+
+endmenu
+endif
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
new file mode 100644 (file)
index 0000000..93e8c14
--- /dev/null
@@ -0,0 +1,63 @@
+msp3400-objs   :=      msp3400-driver.o msp3400-kthreads.o
+obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
+
+obj-$(CONFIG_VIDEO_SMIAPP)     += smiapp/
+obj-$(CONFIG_VIDEO_CX25840) += cx25840/
+obj-$(CONFIG_VIDEO_M5MOLS)     += m5mols/
+
+obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
+obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
+obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
+obj-$(CONFIG_VIDEO_SAA6588) += saa6588.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_SAA711X) += saa7115.o
+obj-$(CONFIG_VIDEO_SAA717X) += saa717x.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_ADV7180) += adv7180.o
+obj-$(CONFIG_VIDEO_ADV7183) += adv7183.o
+obj-$(CONFIG_VIDEO_ADV7343) += adv7343.o
+obj-$(CONFIG_VIDEO_ADV7393) += adv7393.o
+obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
+obj-$(CONFIG_VIDEO_VS6624)  += vs6624.o
+obj-$(CONFIG_VIDEO_BT819) += bt819.o
+obj-$(CONFIG_VIDEO_BT856) += bt856.o
+obj-$(CONFIG_VIDEO_BT866) += bt866.o
+obj-$(CONFIG_VIDEO_KS0127) += ks0127.o
+obj-$(CONFIG_VIDEO_THS7303) += ths7303.o
+obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o
+obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o
+obj-$(CONFIG_VIDEO_TVP7002) += tvp7002.o
+obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
+obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o
+obj-$(CONFIG_VIDEO_M52790) += m52790.o
+obj-$(CONFIG_VIDEO_TLV320AIC23B) += tlv320aic23b.o
+obj-$(CONFIG_VIDEO_WM8775) += wm8775.o
+obj-$(CONFIG_VIDEO_WM8739) += wm8739.o
+obj-$(CONFIG_VIDEO_VP27SMPX) += vp27smpx.o
+obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
+obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
+obj-$(CONFIG_VIDEO_OV7670)     += ov7670.o
+obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
+obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
+obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o
+obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o
+obj-$(CONFIG_VIDEO_MT9T001) += mt9t001.o
+obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o
+obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o
+obj-$(CONFIG_VIDEO_SR030PC30)  += sr030pc30.o
+obj-$(CONFIG_VIDEO_NOON010PC30)        += noon010pc30.o
+obj-$(CONFIG_VIDEO_S5K6AA)     += s5k6aa.o
+obj-$(CONFIG_VIDEO_ADP1653)    += adp1653.o
+obj-$(CONFIG_VIDEO_AS3645A)    += as3645a.o
+obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o
+obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
+obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
+obj-$(CONFIG_VIDEO_AK881X)             += ak881x.o
+obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
similarity index 99%
rename from drivers/media/video/adp1653.c
rename to drivers/media/i2c/adp1653.c
index 57e87090388d174089f68e920e72fe6752e2f884..18a38b38fcb8c9796b16549b2707c8551b6f86fa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/adp1653.c
+ * drivers/media/i2c/adp1653.c
  *
  * Copyright (C) 2008--2011 Nokia Corporation
  *
similarity index 99%
rename from drivers/media/video/as3645a.c
rename to drivers/media/i2c/as3645a.c
index c4b03572dce85862ea048026f8774693103f3fb6..3bfdbf9d9bf1b4accb9632dd2f831d64fe89c12f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/as3645a.c - AS3645A and LM3555 flash controllers driver
+ * drivers/media/i2c/as3645a.c - AS3645A and LM3555 flash controllers driver
  *
  * Copyright (C) 2008-2011 Nokia Corporation
  * Copyright (c) 2011, Intel Corporation.
similarity index 80%
rename from drivers/media/video/cx25840/Makefile
rename to drivers/media/i2c/cx25840/Makefile
index dc40dde2e0c8449a85bb81119b319168b99532e3..898eb13340ae193ef8937c709987f65dbcab209b 100644 (file)
@@ -3,4 +3,4 @@ cx25840-objs    := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
 
 obj-$(CONFIG_VIDEO_CX25840) += cx25840.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
similarity index 99%
rename from drivers/media/video/smiapp-pll.c
rename to drivers/media/i2c/smiapp-pll.c
index a2e41a21dc65908f93a448f8b4eb68b4186424af..a577614bd84f53113470c085e4e1cd221d761a14 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp-pll.c
+ * drivers/media/i2c/smiapp-pll.c
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 98%
rename from drivers/media/video/smiapp-pll.h
rename to drivers/media/i2c/smiapp-pll.h
index 9eab63f23afb1a31c33448dfc25059d55e9d3eba..cb2d2db5d02def416e10e3d638df33079655500f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp-pll.h
+ * drivers/media/i2c/smiapp-pll.h
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 78%
rename from drivers/media/video/smiapp/Makefile
rename to drivers/media/i2c/smiapp/Makefile
index 36b0cfa2c541e6b7fcb5a344d2d22fee6266ccb1..f45a003cbe7e3dbbedfc5d87882389c8d666650a 100644 (file)
@@ -2,4 +2,4 @@ smiapp-objs                     += smiapp-core.o smiapp-regs.o \
                                   smiapp-quirk.o smiapp-limits.o
 obj-$(CONFIG_VIDEO_SMIAPP)     += smiapp.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
similarity index 99%
rename from drivers/media/video/smiapp/smiapp-core.c
rename to drivers/media/i2c/smiapp/smiapp-core.c
index bfd47c10613433fa50990ea6b13f6a00b09db5fd..1cf914d1134554c42e5e5816990e202f983bc8d8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-core.c
+ * drivers/media/i2c/smiapp/smiapp-core.c
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 99%
rename from drivers/media/video/smiapp/smiapp-limits.c
rename to drivers/media/i2c/smiapp/smiapp-limits.c
index 0800e095724e2d4058ba5754880c066a35cda0d8..fb2f81ad8c3b39f56d7507e740f5cd9dc9fd4da2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-limits.c
+ * drivers/media/i2c/smiapp/smiapp-limits.c
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 99%
rename from drivers/media/video/smiapp/smiapp-limits.h
rename to drivers/media/i2c/smiapp/smiapp-limits.h
index 7f4836bb78db97754c0de9b5a2bde3da5f68a694..9ae765e23ea53b20ca3176ce1070205821a4b1f0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-limits.h
+ * drivers/media/i2c/smiapp/smiapp-limits.h
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 99%
rename from drivers/media/video/smiapp/smiapp-quirk.c
rename to drivers/media/i2c/smiapp/smiapp-quirk.c
index 55e87950dcea5ca23d9c482f3f3c93a3ffaf3ed9..cf048128367cc81822dec985bae9a34845c338cf 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-quirk.c
+ * drivers/media/i2c/smiapp/smiapp-quirk.c
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 98%
rename from drivers/media/video/smiapp/smiapp-quirk.h
rename to drivers/media/i2c/smiapp/smiapp-quirk.h
index f4dcaabaefe7066f99cd8d10ed22c5f4bfb62625..86fd3e8bfb0fe0e3e78a116ad93100b6c4ff0013 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-quirk.h
+ * drivers/media/i2c/smiapp/smiapp-quirk.h
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 99%
rename from drivers/media/video/smiapp/smiapp-reg-defs.h
rename to drivers/media/i2c/smiapp/smiapp-reg-defs.h
index a089eb8161e1e3c16f9c5df53602afe6ad8b632f..defa7c5adebf0e07fbd51d4f5d4963baf87d52e0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-reg-defs.h
+ * drivers/media/i2c/smiapp/smiapp-reg-defs.h
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 98%
rename from drivers/media/video/smiapp/smiapp-reg.h
rename to drivers/media/i2c/smiapp/smiapp-reg.h
index d0167aa17534b84d2f94d7455de2dfd336115e62..54568ca2fe6d987c79c477c4262988ff6dcfbf4d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-reg.h
+ * drivers/media/i2c/smiapp/smiapp-reg.h
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 99%
rename from drivers/media/video/smiapp/smiapp-regs.c
rename to drivers/media/i2c/smiapp/smiapp-regs.c
index b1812b17a4075150365a5ff7c6c1cd6b8512b69a..70e0d8db01301d56388ab452c318db728151e35b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp-regs.c
+ * drivers/media/i2c/smiapp/smiapp-regs.c
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 99%
rename from drivers/media/video/smiapp/smiapp.h
rename to drivers/media/i2c/smiapp/smiapp.h
index 587f7f11238d7125f96abc989fa24aed183b099b..4182a695ab53913e540cf230f2a5abdb0b810a38 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/smiapp/smiapp.h
+ * drivers/media/i2c/smiapp/smiapp.h
  *
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
similarity index 99%
rename from drivers/media/video/tcm825x.c
rename to drivers/media/i2c/tcm825x.c
index 462caa44ae001c1a802fe8ca48f46052bcd59917..9252529fc5ddd69f7bd9aa8ff8e20072cb111aab 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/tcm825x.c
+ * drivers/media/i2c/tcm825x.c
  *
  * TCM825X camera sensor driver.
  *
similarity index 99%
rename from drivers/media/video/tcm825x.h
rename to drivers/media/i2c/tcm825x.h
index 5b7e69682368c6189a2965386ced056e7ba5ac48..8ebab953963f869b5f63ea4e8686def0e5e9f573 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/tcm825x.h
+ * drivers/media/i2c/tcm825x.h
  *
  * Register definitions for the TCM825X CameraChip.
  *
similarity index 99%
rename from drivers/media/video/tvp514x.c
rename to drivers/media/i2c/tvp514x.c
index cd615c1d6011feaa31405336e13ce07dc0348a2f..1f3943bb87d531bdc16337feb7f6a36c2e232fbb 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/tvp514x.c
+ * drivers/media/i2c/tvp514x.c
  *
  * TI TVP5146/47 decoder driver
  *
similarity index 99%
rename from drivers/media/video/tvp514x_regs.h
rename to drivers/media/i2c/tvp514x_regs.h
index 18f29ad0dfe2cfbe84db9c694ed1a95be87b316b..d23aa2fbb9b1e2f6f540ad7864298a28d4a3b3b4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/tvp514x_regs.h
+ * drivers/media/i2c/tvp514x_regs.h
  *
  * Copyright (C) 2008 Texas Instruments Inc
  * Author: Vaibhav Hiremath <hvaibhav@ti.com>
index ae347b78fccfcb1ae999359ea8a4d56a58c986f0..5f06597c6a6e1d59c95e3fc3aca613ba7386cdcc 100644 (file)
@@ -7,5 +7,5 @@ obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
index f92cc4c14f0c6d82a64cbdaa5135ab34ca0abbfd..a2cbdcf15a8c48fde4cd79c43b33dd92c81a8def 100644 (file)
@@ -7,7 +7,7 @@ cx23885-objs    := cx23885-cards.o cx23885-video.o cx23885-vbi.o \
 obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
 obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 1434e80948036b4c4c55bfda4c48665f1839697c..c038941d6054ca2f815d50811f06edb9a0b24e7e 100644 (file)
@@ -7,7 +7,7 @@ cx25821-y   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
 obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
 obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
 
-ccflags-y := -Idrivers/media/video
+ccflags-y := -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 884b4cdd8ff09fae05c772e49988ff6c313936ac..d3679c3ee248bf5bf5e14d1d0de2ea166bb2f1aa 100644 (file)
@@ -10,7 +10,7 @@ obj-$(CONFIG_VIDEO_CX88_BLACKBIRD) += cx88-blackbird.o
 obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
 obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 80b4ec18475dce2aff8e7fb91af9424ae9936695..1408c9f1de93242c6312b2c76240acee1ddc3102 100644 (file)
@@ -7,7 +7,7 @@ ivtv-objs       := ivtv-routing.o ivtv-cards.o ivtv-controls.o \
 obj-$(CONFIG_VIDEO_IVTV) += ivtv.o
 obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o
 
-ccflags-y += -I$(srctree)/drivers/media/video
+ccflags-y += -I$(srctree)/drivers/media/i2c
 ccflags-y += -I$(srctree)/drivers/media/tuners
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
index aba50088dcdc5a1d376c0df78b1353128d329d60..9e510c1459f34eddc6b9be20c5f2c401c2223f58 100644 (file)
@@ -10,7 +10,7 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
 
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
-ccflags-y += -I$(srctree)/drivers/media/video
+ccflags-y += -I$(srctree)/drivers/media/i2c
 ccflags-y += -I$(srctree)/drivers/media/tuners
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
index 362a38b96308f46ce73a650f857205ae2fd24b2a..f3566a95e4aa1dd8cbbbedc048ac79d65444a389 100644 (file)
@@ -2,4 +2,4 @@ obj-$(CONFIG_VIDEO_MXB) += mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
 obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
 
-ccflags-y += -I$(srctree)/drivers/media/video
+ccflags-y += -I$(srctree)/drivers/media/i2c
index 847110c2e14c07315a2596238524ce12ac5daca8..ba0e33a1ee2488869544a06f15e57e2ef83a52a5 100644 (file)
@@ -4,7 +4,7 @@ saa7164-objs    := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \
 
 obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o
 
-ccflags-y += -I$(srctree)/drivers/media/video
+ccflags-y += -I$(srctree)/drivers/media/i2c
 ccflags-y += -I$(srctree)/drivers/media/tuners
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
index 1d40fce7760105e09232f99c1c3898834d097108..52cf76935e69b02a666d5535d6f3fc23d5b759df 100644 (file)
@@ -8,7 +8,7 @@ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx.o
 obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o
 obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 65c7c29e41612c860fdc3f87ccb8884bb4ad5297..6c5f3381da7da811fbd98724e486c543102fa9ff 100644 (file)
@@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o
 obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o
 obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 52f057f24e3944a174b134bc65921abb55b78070..9b8d1463c52636dd18814ca3b8f61b7463a306eb 100644 (file)
@@ -2,6 +2,6 @@ hdpvr-objs      := hdpvr-control.o hdpvr-core.o hdpvr-video.o hdpvr-i2c.o
 
 obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 
 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
index bc716db797e33f4851462da10fe4f487a10a6c5e..ad705547bdcedb7c448effb65cf35732317c4d3e 100644 (file)
@@ -16,7 +16,7 @@ pvrusb2-objs  := pvrusb2-i2c-core.o \
 
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 8a3c78482e73c425f269351f1f286aacaf63c9db..dfe3e90ff392fb3e0e7b17f30dc3bf58180e408e 100644 (file)
@@ -8,4 +8,4 @@ stk1160-y :=    stk1160-core.o \
 
 obj-$(CONFIG_VIDEO_STK1160) += stk1160.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
index 4d660879999f75d1afd07d3df4f0e45653071b5d..137f8e38cdecfd986c19de331dcb800b48e1b0c4 100644 (file)
@@ -2,7 +2,7 @@ poseidon-objs := pd-video.o pd-alsa.o pd-dvb.o pd-radio.o pd-main.o
 
 obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 1feb8c9c816c523cabb5a75cdaaf39c93ae6e9ff..6fa1f1044512c6880a70a06a9ffa53a867440a1d 100644 (file)
@@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
 obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
 obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
 
-ccflags-y := -Idrivers/media/video
+ccflags-y := -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index d55c6bd97a3557ba50e0995268965252ab6ed457..9b3a5581df4205f240143bbabf64dec4c60ad5ab 100644 (file)
@@ -2,5 +2,5 @@ usbvision-objs  := usbvision-core.o usbvision-video.o usbvision-i2c.o usbvision-
 
 obj-$(CONFIG_VIDEO_USBVISION) += usbvision.o
 
-ccflags-y += -Idrivers/media/video
+ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/tuners
index a7bd9576ccd0953d9775ef59747312db6fdb6e52..f2171e777dd3d260446c64523837ae2a2d4a2867 100644 (file)
@@ -1,578 +1,4 @@
-#
-# Generic video config states
-#
-
-config VIDEO_BTCX
-       depends on PCI
-       tristate
-
-config VIDEO_TVEEPROM
-       tristate
-       depends on I2C
-
-#
-# Multimedia Video device configuration
-#
-
-menuconfig VIDEO_CAPTURE_DRIVERS
-       bool "Video capture adapters"
-       depends on VIDEO_V4L2
-       depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT
-       default y
-       ---help---
-         Say Y here to enable selecting the video adapters for
-         webcams, analog TV, and hybrid analog/digital TV.
-         Some of those devices also supports FM radio.
-
-if VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2
-
-config VIDEO_HELPER_CHIPS_AUTO
-       bool "Autoselect pertinent encoders/decoders and other helper chips"
-       default y if !EXPERT
-       ---help---
-         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.
-
-         Unselect this only if you know exactly what you are doing, since
-         it may break support on some boards.
-
-         In doubt, say Y.
-
-config VIDEO_IR_I2C
-       tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
-       depends on I2C && RC_CORE
-       default y
-       ---help---
-         Most boards have an IR chip directly connected via GPIO. However,
-         some video boards have the IR connected via I2C bus.
-
-         If your board doesn't have an I2C IR chip, you may disable this
-         option.
-
-         In doubt, say Y.
-
-#
-# Encoder / Decoder module configuration
-#
-
-menu "Encoders, decoders, sensors and other helper chips"
-       visible if !VIDEO_HELPER_CHIPS_AUTO
-
-comment "Audio decoders, processors and mixers"
-
-config VIDEO_TVAUDIO
-       tristate "Simple audio decoder chips"
-       depends on VIDEO_V4L2 && 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 tvaudio.
-
-config VIDEO_TDA7432
-       tristate "Philips TDA7432 audio processor"
-       depends on VIDEO_V4L2 && 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_TDA9840
-       tristate "Philips TDA9840 audio processor"
-       depends on 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_TEA6415C
-       tristate "Philips TEA6415C audio processor"
-       depends on 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 "Philips TEA6420 audio processor"
-       depends on 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_V4L2 && 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_CS5345
-       tristate "Cirrus Logic CS5345 audio ADC"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the Cirrus Logic CS5345 24-bit, 192 kHz
-         stereo A/D converter.
-
-         To compile this driver as a module, choose M here: the
-         module will be called cs5345.
-
-config VIDEO_CS53L32A
-       tristate "Cirrus Logic CS53L32A audio ADC"
-       depends on VIDEO_V4L2 && I2C
-       ---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_TLV320AIC23B
-       tristate "Texas Instruments TLV320AIC23B audio codec"
-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
-       ---help---
-         Support for the Texas Instruments TLV320AIC23B audio codec.
-
-         To compile this driver as a module, choose M here: the
-         module will be called tlv320aic23b.
-
-config VIDEO_WM8775
-       tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"
-       depends on VIDEO_V4L2 && I2C
-       ---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_V4L2 && I2C
-       ---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.
-
-config VIDEO_VP27SMPX
-       tristate "Panasonic VP27s internal MPX"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the internal MPX of the Panasonic VP27s tuner.
-
-         To compile this driver as a module, choose M here: the
-         module will be called vp27smpx.
-
-comment "RDS decoders"
-
-config VIDEO_SAA6588
-       tristate "SAA6588 Radio Chip RDS decoder support"
-       depends on VIDEO_V4L2 && I2C
-
-       help
-         Support for this Radio Data System (RDS) decoder. This allows
-         seeing radio station identification transmitted using this
-         standard.
-
-         To compile this driver as a module, choose M here: the
-         module will be called saa6588.
-
-comment "Video decoders"
-
-config VIDEO_ADV7180
-       tristate "Analog Devices ADV7180 decoder"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the Analog Devices ADV7180 video decoder.
-
-         To compile this driver as a module, choose M here: the
-         module will be called adv7180.
-
-config VIDEO_ADV7183
-       tristate "Analog Devices ADV7183 decoder"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         V4l2 subdevice driver for the Analog Devices
-         ADV7183 video decoder.
-
-         To compile this driver as a module, choose M here: the
-         module will be called adv7183.
-
-config VIDEO_BT819
-       tristate "BT819A VideoStream decoder"
-       depends on VIDEO_V4L2 && 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_V4L2 && 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_V4L2 && 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_KS0127
-       tristate "KS0127 video decoder"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for KS0127 video decoder.
-
-         This chip is used on AverMedia AVS6EYES Zoran-based MJPEG
-         cards.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ks0127.
-
-config VIDEO_SAA7110
-       tristate "Philips SAA7110 video decoder"
-       depends on VIDEO_V4L2 && I2C
-       ---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_SAA711X
-       tristate "Philips SAA7111/3/4/5 video decoders"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the Philips SAA7111/3/4/5 video decoders.
-
-         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_V4L2 && 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_TVP514X
-       tristate "Texas Instruments TVP514x video decoder"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         This is a Video4Linux2 sensor-level driver for the TI TVP5146/47
-         decoder. It is currently working with the TI OMAP3 camera
-         controller.
-
-         To compile this driver as a module, choose M here: the
-         module will be called tvp514x.
-
-config VIDEO_TVP5150
-       tristate "Texas Instruments TVP5150 video decoder"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the Texas Instruments TVP5150 video decoder.
-
-         To compile this driver as a module, choose M here: the
-         module will be called tvp5150.
-
-config VIDEO_TVP7002
-       tristate "Texas Instruments TVP7002 video decoder"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the Texas Instruments TVP7002 video decoder.
-
-         To compile this driver as a module, choose M here: the
-         module will be called tvp7002.
-
-config VIDEO_VPX3220
-       tristate "vpx3220a, vpx3216b & vpx3214c video decoders"
-       depends on VIDEO_V4L2 && 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 and audio decoders"
-
-config VIDEO_SAA717X
-       tristate "Philips SAA7171/3/4 audio/video decoders"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the Philips SAA7171/3/4 audio/video decoders.
-
-         To compile this driver as a module, choose M here: the
-         module will be called saa717x.
-
-source "drivers/media/video/cx25840/Kconfig"
-
-comment "MPEG video encoders"
-
-config VIDEO_CX2341X
-       tristate "Conexant CX2341x MPEG encoders"
-       depends on VIDEO_V4L2 && VIDEO_V4L2_COMMON
-       ---help---
-         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 cx2341x.
-
-comment "Video encoders"
-
-config VIDEO_SAA7127
-       tristate "Philips SAA7127/9 digital video encoders"
-       depends on VIDEO_V4L2 && I2C
-       ---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_SAA7185
-       tristate "Philips SAA7185 video encoder"
-       depends on VIDEO_V4L2 && 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"
-       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"
-       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.
-
-config VIDEO_ADV7343
-       tristate "ADV7343 video encoder"
-       depends on I2C
-       help
-         Support for Analog Devices I2C bus based ADV7343 encoder.
-
-         To compile this driver as a module, choose M here: the
-         module will be called adv7343.
-
-config VIDEO_ADV7393
-       tristate "ADV7393 video encoder"
-       depends on I2C
-       help
-         Support for Analog Devices I2C bus based ADV7393 encoder.
-
-         To compile this driver as a module, choose M here: the
-         module will be called adv7393.
-
-config VIDEO_AK881X
-       tristate "AK8813/AK8814 video encoders"
-       depends on I2C
-       help
-         Video output driver for AKM AK8813 and AK8814 TV encoders
-
-comment "Camera sensor devices"
-
-config VIDEO_APTINA_PLL
-       tristate
-
-config VIDEO_SMIAPP_PLL
-       tristate
-
-config VIDEO_OV7670
-       tristate "OmniVision OV7670 sensor support"
-       depends on I2C && VIDEO_V4L2
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a Video4Linux2 sensor-level driver for the OmniVision
-         OV7670 VGA camera.  It currently only works with the M88ALP01
-         controller.
-
-config VIDEO_VS6624
-       tristate "ST VS6624 sensor support"
-       depends on VIDEO_V4L2 && I2C
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a Video4Linux2 sensor-level driver for the ST VS6624
-         camera.
-
-         To compile this driver as a module, choose M here: the
-         module will be called vs6624.
-
-config VIDEO_MT9M032
-       tristate "MT9M032 camera sensor support"
-       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-       depends on MEDIA_CAMERA_SUPPORT
-       select VIDEO_APTINA_PLL
-       ---help---
-         This driver supports MT9M032 camera sensors from Aptina, monochrome
-         models only.
-
-config VIDEO_MT9P031
-       tristate "Aptina MT9P031 support"
-       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-       depends on MEDIA_CAMERA_SUPPORT
-       select VIDEO_APTINA_PLL
-       ---help---
-         This is a Video4Linux2 sensor-level driver for the Aptina
-         (Micron) mt9p031 5 Mpixel camera.
-
-config VIDEO_MT9T001
-       tristate "Aptina MT9T001 support"
-       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a Video4Linux2 sensor-level driver for the Aptina
-         (Micron) mt0t001 3 Mpixel camera.
-
-config VIDEO_MT9V011
-       tristate "Micron mt9v011 sensor support"
-       depends on I2C && VIDEO_V4L2
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a Video4Linux2 sensor-level driver for the Micron
-         mt0v011 1.3 Mpixel camera.  It currently only works with the
-         em28xx driver.
-
-config VIDEO_MT9V032
-       tristate "Micron MT9V032 sensor support"
-       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a Video4Linux2 sensor-level driver for the Micron
-         MT9V032 752x480 CMOS sensor.
-
-config VIDEO_TCM825X
-       tristate "TCM825x camera sensor support"
-       depends on I2C && VIDEO_V4L2
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a driver for the Toshiba TCM825x VGA camera sensor.
-         It is used for example in Nokia N800.
-
-config VIDEO_SR030PC30
-       tristate "Siliconfile SR030PC30 sensor support"
-       depends on I2C && VIDEO_V4L2
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This driver supports SR030PC30 VGA camera from Siliconfile
-
-config VIDEO_NOON010PC30
-       tristate "Siliconfile NOON010PC30 sensor support"
-       depends on I2C && VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_SUBDEV_API
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This driver supports NOON010PC30 CIF camera from Siliconfile
-
-source "drivers/media/video/m5mols/Kconfig"
-
-config VIDEO_S5K6AA
-       tristate "Samsung S5K6AAFX sensor support"
-       depends on MEDIA_CAMERA_SUPPORT
-       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-       ---help---
-         This is a V4L2 sensor-level driver for Samsung S5K6AA(FX) 1.3M
-         camera sensor with an embedded SoC image signal processor.
-
-source "drivers/media/video/smiapp/Kconfig"
-
-comment "Flash devices"
-
-config VIDEO_ADP1653
-       tristate "ADP1653 flash support"
-       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a driver for the ADP1653 flash controller. It is used for
-         example in Nokia N900.
-
-config VIDEO_AS3645A
-       tristate "AS3645A flash driver support"
-       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
-       depends on MEDIA_CAMERA_SUPPORT
-       ---help---
-         This is a driver for the AS3645A and LM3555 flash controllers. It has
-         build in control for flash, torch and indicator LEDs.
-
-comment "Video improvement chips"
-
-config VIDEO_UPD64031A
-       tristate "NEC Electronics uPD64031A Ghost Reduction"
-       depends on VIDEO_V4L2 && I2C
-       ---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.
-
-config VIDEO_UPD64083
-       tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
-       depends on VIDEO_V4L2 && I2C
-       ---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.
-
-         To compile this driver as a module, choose M here: the
-         module will be called upd64083.
-
-comment "Miscelaneous helper chips"
-
-config VIDEO_THS7303
-       tristate "THS7303 Video Amplifier"
-       depends on I2C
-       help
-         Support for TI THS7303 video amplifier
-
-         To compile this driver as a module, choose M here: the
-         module will be called ths7303.
-
-config VIDEO_M52790
-       tristate "Mitsubishi M52790 A/V switch"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-        Support for the Mitsubishi M52790 A/V switch.
-
-        To compile this driver as a module, choose M here: the
-        module will be called m52790.
-
-endmenu # encoder / decoder chips
+if MEDIA_CAMERA_SUPPORT
 
 config VIDEO_VIVI
        tristate "Virtual Video Driver"
@@ -877,7 +303,6 @@ source "drivers/media/video/s5p-fimc/Kconfig"
 source "drivers/media/video/s5p-tv/Kconfig"
 
 endif # V4L_PLATFORM_DRIVERS
-endif # VIDEO_CAPTURE_DRIVERS
 
 menuconfig V4L_MEM2MEM_DRIVERS
        bool "Memory-to-memory multimedia devices"
@@ -955,3 +380,5 @@ config VIDEO_MX2_EMMAPRP
            conversion.
 
 endif # V4L_MEM2MEM_DRIVERS
+
+endif # MEDIA_CAMERA_SUPPORT
index a0c66923fcdef2b5277137f099cdaaf1684cddba..52a04faa60e837b43d69bb166a174bf24b711027 100644 (file)
@@ -2,73 +2,9 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-msp3400-objs   :=      msp3400-driver.o msp3400-kthreads.o
-
 omap2cam-objs  :=      omap24xxcam.o omap24xxcam-dma.o
 
-# Helper modules
-
-obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
-
-# All i2c modules must come first:
-
-obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
-obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
-obj-$(CONFIG_VIDEO_SAA6588) += saa6588.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_SAA711X) += saa7115.o
-obj-$(CONFIG_VIDEO_SAA717X) += saa717x.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_ADV7180) += adv7180.o
-obj-$(CONFIG_VIDEO_ADV7183) += adv7183.o
-obj-$(CONFIG_VIDEO_ADV7343) += adv7343.o
-obj-$(CONFIG_VIDEO_ADV7393) += adv7393.o
-obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
-obj-$(CONFIG_VIDEO_VS6624)  += vs6624.o
-obj-$(CONFIG_VIDEO_BT819) += bt819.o
-obj-$(CONFIG_VIDEO_BT856) += bt856.o
-obj-$(CONFIG_VIDEO_BT866) += bt866.o
-obj-$(CONFIG_VIDEO_KS0127) += ks0127.o
-obj-$(CONFIG_VIDEO_THS7303) += ths7303.o
 obj-$(CONFIG_VIDEO_VINO) += indycam.o
-obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o
-obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o
-obj-$(CONFIG_VIDEO_TVP7002) += tvp7002.o
-obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
-obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
-obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o
-obj-$(CONFIG_VIDEO_M52790) += m52790.o
-obj-$(CONFIG_VIDEO_TLV320AIC23B) += tlv320aic23b.o
-obj-$(CONFIG_VIDEO_WM8775) += wm8775.o
-obj-$(CONFIG_VIDEO_WM8739) += wm8739.o
-obj-$(CONFIG_VIDEO_VP27SMPX) += vp27smpx.o
-obj-$(CONFIG_VIDEO_CX25840) += cx25840/
-obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
-obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
-obj-$(CONFIG_VIDEO_OV7670)     += ov7670.o
-obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
-obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
-obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o
-obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o
-obj-$(CONFIG_VIDEO_MT9T001) += mt9t001.o
-obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o
-obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o
-obj-$(CONFIG_VIDEO_SR030PC30)  += sr030pc30.o
-obj-$(CONFIG_VIDEO_NOON010PC30)        += noon010pc30.o
-obj-$(CONFIG_VIDEO_M5MOLS)     += m5mols/
-obj-$(CONFIG_VIDEO_S5K6AA)     += s5k6aa.o
-obj-$(CONFIG_VIDEO_SMIAPP)     += smiapp/
-obj-$(CONFIG_VIDEO_ADP1653)    += adp1653.o
-obj-$(CONFIG_VIDEO_AS3645A)    += as3645a.o
-
-obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o
 
 obj-$(CONFIG_SOC_CAMERA_IMX074)                += imx074.o
 obj-$(CONFIG_SOC_CAMERA_MT9M001)       += mt9m001.o
@@ -85,16 +21,12 @@ obj-$(CONFIG_SOC_CAMERA_OV9740)             += ov9740.o
 obj-$(CONFIG_SOC_CAMERA_RJ54N1)                += rj54n1cb0c.o
 obj-$(CONFIG_SOC_CAMERA_TW9910)                += tw9910.o
 
-# And now the v4l2 drivers:
-
 obj-$(CONFIG_VIDEO_VINO) += vino.o
 obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o
 
-obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
 
 obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
 
-obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 
 obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
 obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
@@ -107,7 +39,6 @@ obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
 
-obj-$(CONFIG_VIDEO_AK881X)             += ak881x.o
 
 obj-$(CONFIG_VIDEO_OMAP2)              += omap2cam.o
 obj-$(CONFIG_SOC_CAMERA)               += soc_camera.o soc_mediabus.o
@@ -140,8 +71,6 @@ obj-$(CONFIG_ARCH_DAVINCI)           += davinci/
 
 obj-$(CONFIG_VIDEO_SH_VOU)             += sh_vou.o
 
-obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
-
 obj-y  += davinci/
 
 obj-$(CONFIG_ARCH_OMAP)        += omap/