diff options
| -rw-r--r-- | drivers/media/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/media/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/Kconfig | 566 | ||||
| -rw-r--r-- | drivers/media/i2c/Makefile | 63 | ||||
| -rw-r--r-- | drivers/media/i2c/adp1653.c (renamed from drivers/media/video/adp1653.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7170.c (renamed from drivers/media/video/adv7170.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7175.c (renamed from drivers/media/video/adv7175.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7180.c (renamed from drivers/media/video/adv7180.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7183.c (renamed from drivers/media/video/adv7183.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7183_regs.h (renamed from drivers/media/video/adv7183_regs.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7343.c (renamed from drivers/media/video/adv7343.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7343_regs.h (renamed from drivers/media/video/adv7343_regs.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7393.c (renamed from drivers/media/video/adv7393.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/adv7393_regs.h (renamed from drivers/media/video/adv7393_regs.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/ak881x.c (renamed from drivers/media/video/ak881x.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/aptina-pll.c (renamed from drivers/media/video/aptina-pll.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/aptina-pll.h (renamed from drivers/media/video/aptina-pll.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/as3645a.c (renamed from drivers/media/video/as3645a.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/bt819.c (renamed from drivers/media/video/bt819.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/bt856.c (renamed from drivers/media/video/bt856.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/bt866.c (renamed from drivers/media/video/bt866.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/btcx-risc.c (renamed from drivers/media/video/btcx-risc.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/btcx-risc.h (renamed from drivers/media/video/btcx-risc.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cs5345.c (renamed from drivers/media/video/cs5345.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cs53l32a.c (renamed from drivers/media/video/cs53l32a.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx2341x.c (renamed from drivers/media/video/cx2341x.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/Kconfig (renamed from drivers/media/video/cx25840/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/Makefile (renamed from drivers/media/video/cx25840/Makefile) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-audio.c (renamed from drivers/media/video/cx25840/cx25840-audio.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-core.c (renamed from drivers/media/video/cx25840/cx25840-core.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-core.h (renamed from drivers/media/video/cx25840/cx25840-core.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-firmware.c (renamed from drivers/media/video/cx25840/cx25840-firmware.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-ir.c (renamed from drivers/media/video/cx25840/cx25840-ir.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-vbi.c (renamed from drivers/media/video/cx25840/cx25840-vbi.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/ir-kbd-i2c.c (renamed from drivers/media/video/ir-kbd-i2c.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/ks0127.c (renamed from drivers/media/video/ks0127.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/ks0127.h (renamed from drivers/media/video/ks0127.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m52790.c (renamed from drivers/media/video/m52790.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m5mols/Kconfig (renamed from drivers/media/video/m5mols/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m5mols/Makefile (renamed from drivers/media/video/m5mols/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m5mols/m5mols.h (renamed from drivers/media/video/m5mols/m5mols.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m5mols/m5mols_capture.c (renamed from drivers/media/video/m5mols/m5mols_capture.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m5mols/m5mols_controls.c (renamed from drivers/media/video/m5mols/m5mols_controls.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m5mols/m5mols_core.c (renamed from drivers/media/video/m5mols/m5mols_core.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/m5mols/m5mols_reg.h (renamed from drivers/media/video/m5mols/m5mols_reg.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/msp3400-driver.c (renamed from drivers/media/video/msp3400-driver.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/msp3400-driver.h (renamed from drivers/media/video/msp3400-driver.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/msp3400-kthreads.c (renamed from drivers/media/video/msp3400-kthreads.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/mt9m032.c (renamed from drivers/media/video/mt9m032.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/mt9p031.c (renamed from drivers/media/video/mt9p031.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/mt9t001.c (renamed from drivers/media/video/mt9t001.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/mt9v011.c (renamed from drivers/media/video/mt9v011.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/mt9v032.c (renamed from drivers/media/video/mt9v032.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/noon010pc30.c (renamed from drivers/media/video/noon010pc30.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/ov7670.c (renamed from drivers/media/video/ov7670.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/s5k6aa.c (renamed from drivers/media/video/s5k6aa.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa6588.c (renamed from drivers/media/video/saa6588.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa7110.c (renamed from drivers/media/video/saa7110.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa7115.c (renamed from drivers/media/video/saa7115.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa711x_regs.h (renamed from drivers/media/video/saa711x_regs.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa7127.c (renamed from drivers/media/video/saa7127.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa717x.c (renamed from drivers/media/video/saa717x.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa7185.c (renamed from drivers/media/video/saa7185.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa7191.c (renamed from drivers/media/video/saa7191.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/saa7191.h (renamed from drivers/media/video/saa7191.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp-pll.c (renamed from drivers/media/video/smiapp-pll.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp-pll.h (renamed from drivers/media/video/smiapp-pll.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/Kconfig (renamed from drivers/media/video/smiapp/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/Makefile (renamed from drivers/media/video/smiapp/Makefile) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-core.c (renamed from drivers/media/video/smiapp/smiapp-core.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-limits.c (renamed from drivers/media/video/smiapp/smiapp-limits.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-limits.h (renamed from drivers/media/video/smiapp/smiapp-limits.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-quirk.c (renamed from drivers/media/video/smiapp/smiapp-quirk.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-quirk.h (renamed from drivers/media/video/smiapp/smiapp-quirk.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-reg-defs.h (renamed from drivers/media/video/smiapp/smiapp-reg-defs.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-reg.h (renamed from drivers/media/video/smiapp/smiapp-reg.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-regs.c (renamed from drivers/media/video/smiapp/smiapp-regs.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-regs.h (renamed from drivers/media/video/smiapp/smiapp-regs.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp.h (renamed from drivers/media/video/smiapp/smiapp.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/sr030pc30.c (renamed from drivers/media/video/sr030pc30.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tcm825x.c (renamed from drivers/media/video/tcm825x.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/tcm825x.h (renamed from drivers/media/video/tcm825x.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/tda7432.c (renamed from drivers/media/video/tda7432.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tda9840.c (renamed from drivers/media/video/tda9840.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tea6415c.c (renamed from drivers/media/video/tea6415c.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tea6415c.h (renamed from drivers/media/video/tea6415c.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tea6420.c (renamed from drivers/media/video/tea6420.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tea6420.h (renamed from drivers/media/video/tea6420.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/ths7303.c (renamed from drivers/media/video/ths7303.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tlv320aic23b.c (renamed from drivers/media/video/tlv320aic23b.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tvaudio.c (renamed from drivers/media/video/tvaudio.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tveeprom.c (renamed from drivers/media/video/tveeprom.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tvp514x.c (renamed from drivers/media/video/tvp514x.c) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/tvp514x_regs.h (renamed from drivers/media/video/tvp514x_regs.h) | 2 | ||||
| -rw-r--r-- | drivers/media/i2c/tvp5150.c (renamed from drivers/media/video/tvp5150.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tvp5150_reg.h (renamed from drivers/media/video/tvp5150_reg.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tvp7002.c (renamed from drivers/media/video/tvp7002.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/tvp7002_reg.h (renamed from drivers/media/video/tvp7002_reg.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/upd64031a.c (renamed from drivers/media/video/upd64031a.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/upd64083.c (renamed from drivers/media/video/upd64083.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/vp27smpx.c (renamed from drivers/media/video/vp27smpx.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/vpx3220.c (renamed from drivers/media/video/vpx3220.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/vs6624.c (renamed from drivers/media/video/vs6624.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/vs6624_regs.h (renamed from drivers/media/video/vs6624_regs.h) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/wm8739.c (renamed from drivers/media/video/wm8739.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/wm8775.c (renamed from drivers/media/video/wm8775.c) | 0 | ||||
| -rw-r--r-- | drivers/media/pci/bt8xx/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/pci/cx23885/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/pci/cx25821/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/pci/cx88/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/pci/saa7134/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/pci/saa7146/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/pci/saa7164/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/cx231xx/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/em28xx/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/hdpvr/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/pvrusb2/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/stk1160/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/tlg2300/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/tm6000/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/usb/usbvision/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/video/Kconfig | 579 | ||||
| -rw-r--r-- | drivers/media/video/Makefile | 71 |
124 files changed, 671 insertions, 689 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index c9cdc61e8b51..26f3de57a971 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -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" diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 360c44dec3e4..e1be19615861 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile @@ -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 index 000000000000..1c677f5e3a1a --- /dev/null +++ b/drivers/media/i2c/Kconfig @@ -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. + |