diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Kconfig.staging | 102 | ||||
| -rw-r--r-- | v4l/Makefile | 2 | ||||
| -rw-r--r-- | v4l/Makefile.staging | 58 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 2 | ||||
| -rw-r--r-- | v4l/versions.txt | 22 |
5 files changed, 180 insertions, 6 deletions
diff --git a/v4l/Kconfig.staging b/v4l/Kconfig.staging new file mode 100644 index 000000000..45bfeb002 --- /dev/null +++ b/v4l/Kconfig.staging @@ -0,0 +1,102 @@ +menuconfig STAGING + bool "Staging drivers" + default n + ---help--- + This option allows you to select a number of drivers that are + not of the "normal" Linux kernel quality level. These drivers + are placed here in order to get a wider audience for use of + them. Please note that these drivers are under heavy + development, may or may not work, and may contain userspace + interfaces that most likely will be changed in the near + future. + + Using any of these drivers will taint your kernel which might + affect support options from both the community, and various + commercial support orginizations. + + If you wish to work on these drivers, to help improve them, or + to report problems you have with them, please see the + driver_name.README file in the drivers/staging/ directory to + see what needs to be worked on, and who to contact. + + If in doubt, say N here. + + +if STAGING +menu "Media devices in staging" + +config VIDEO_GO7007 + tristate "Go 7007 support" + depends on VIDEO_DEV && PCI && I2C && INPUT + depends on SND + select VIDEOBUF_DMA_SG + select VIDEO_IR + select VIDEO_TUNER + select VIDEO_TVEEPROM + select SND_PCM + select CRC32 + default N + ---help--- + This is a video4linux driver for some wierd device... + + To compile this driver as a module, choose M here: the + module will be called go7007. + +config VIDEO_GO7007_USB + tristate "Go 7007 USB support" + depends on VIDEO_GO7007 && USB + default N + ---help--- + This is a video4linux driver for some wierd device... + + To compile this driver as a module, choose M here: the + module will be called go7007-usb. + +config VIDEO_GO7007_USB_S2250_BOARD + tristate "Sensoray 2250/2251 support" + depends on VIDEO_GO7007_USB && DVB_USB + default N + ---help--- + This is a video4linux driver for the Sensoray 2250/2251 device + + To compile this driver as a module, choose M here: the + module will be called s2250. + +config VIDEO_CX25821 + tristate "Conexant cx25821 support" + depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT + select I2C_ALGOBIT + select VIDEO_BTCX + select VIDEO_TVEEPROM + select VIDEO_IR + select VIDEOBUF_DVB + select VIDEOBUF_DMA_SG + select VIDEO_CX25840 + select VIDEO_CX2341X + ---help--- + This is a video4linux driver for Conexant 25821 based + TV cards. + + To compile this driver as a module, choose M here: the + module will be called cx25821 + +config VIDEO_CX25821_ALSA + tristate "Conexant 25821 DMA audio support" + depends on VIDEO_CX25821 && SND && EXPERIMENTAL + select SND_PCM + ---help--- + This is a video4linux driver for direct (DMA) audio on + Conexant 25821 based capture cards using ALSA. + + It only works with boards with function 01 enabled. + To check if your board supports, use lspci -n. + If supported, you should see 14f1:8801 or 14f1:8811 + PCI device. + + To compile this driver as a module, choose M here: the + module will be called cx25821-alsa. + + +endmenu + +endif # STAGING diff --git a/v4l/Makefile b/v4l/Makefile index 29b9675ae..76d0bdd80 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -106,6 +106,7 @@ endif ifeq ($(makefile-media),1) -include $(obj)/Makefile.media -include $(obj)/Makefile.sound +-include $(obj)/Makefile.staging endif -include $(obj)/.kconfig.dep @@ -278,6 +279,7 @@ links:: @echo creating symbolic links... @find ../linux/drivers/media -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=. @find ../linux/sound -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=. + @find ../linux/drivers/staging -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=. # This link is so code with #include "oss/*.h" will find its header files oss: diff --git a/v4l/Makefile.staging b/v4l/Makefile.staging new file mode 100644 index 000000000..77ba6a9fa --- /dev/null +++ b/v4l/Makefile.staging @@ -0,0 +1,58 @@ +# From drivers/staging/go7007/Makefile + +#obj-m += go7007.o go7007-usb.o snd-go7007.o wis-saa7115.o wis-tw9903.o \ + wis-uda1342.o wis-sony-tuner.o wis-saa7113.o wis-ov7640.o \ + wis-tw2804.o + + +obj-$(CONFIG_VIDEO_GO7007) += go7007.o +obj-$(CONFIG_VIDEO_GO7007_USB) += go7007-usb.o +obj-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD) += s2250.o + +go7007-objs += go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \ + snd-go7007.o wis-saa7113.o + +s2250-objs += s2250-board.o s2250-loader.o + +# Uncompile when the saa7134 patches get into upstream +#ifneq ($(CONFIG_VIDEO_SAA7134),) +#obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o +#EXTRA_CFLAGS += -Idrivers/media/video/saa7134 +#endif + +ifneq ($(CONFIG_VIDEO_GO7007_USB_S2250_BOARD),) +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb +endif + +EXTRA_CFLAGS += -Idrivers/staging/saa7134 +EXTRA_CFLAGS += -Idrivers/media/dvb/frontends +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core + +KDIRA := /lib/modules/$(KERNELRELEASE)/kernel + +staging-install install-staging:: + @dir="drivers/staging/go7007"; \ + files='go7007.ko go7007-usb.ko s2250.ko'; \ + echo -e "\nInstalling $(KDIRA)/$$dir files:"; \ + install -d $(KDIRA)/$$dir; \ + for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \ + install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo; + +# From drivers/staging/cx25821/Makefile + +cx25821-objs := cx25821-core.o cx25821-cards.o cx25821-i2c.o cx25821-gpio.o \ + cx25821-medusa-video.o cx25821-video.o cx25821-video0.o cx25821-video1.o \ + cx25821-video2.o cx25821-video3.o cx25821-video4.o cx25821-video5.o \ + cx25821-video6.o cx25821-video7.o cx25821-vidups9.o cx25821-vidups10.o \ + cx25821-audups11.o cx25821-video-upstream.o cx25821-video-upstream-ch2.o \ + cx25821-audio-upstream.o cx25821-videoioctl.o + +obj-$(CONFIG_VIDEO_CX25821) += cx25821.o +obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o + +EXTRA_CFLAGS += -Idrivers/media/video +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core +EXTRA_CFLAGS += -Idrivers/media/dvb/frontends + +EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) + diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index cfe53a636..fd6dbd739 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -585,6 +585,7 @@ EOF open_kconfig('../linux', '../linux/drivers/media/Kconfig'); open_kconfig('.', './Kconfig.sound'); +open_kconfig('.', './Kconfig.staging'); close OUT; # These options should default to off @@ -592,6 +593,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); disable_config('VIDEO_FIXED_MINOR_RANGES'); +$intopt { "DVB_MAX_ADAPTERS" } = 8; # Check dependencies my %newconfig = checkdeps(); diff --git a/v4l/versions.txt b/v4l/versions.txt index d4c7bd380..f7caf396e 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -7,11 +7,25 @@ VIDEO_VPSS_SYSTEM VIDEO_VPFE_CAPTURE VIDEO_DM6446_CCDC VIDEO_DM355_CCDC +# Start version for those drivers - probably compile with older versions +VIDEO_CX25821 +VIDEO_CX25821_ALSA [2.6.29] # Needs defines that are only available from 2.6.29 VIDEO_PXA27x +[2.6.28] +# dev_get_drvdata switched to const struct device * +SOC_CAMERA +SOC_CAMERA_MT9V022 +SOC_CAMERA_MT9M001 +SOC_CAMERA_MT9M111 +SOC_CAMERA_MT9T031 +SOC_CAMERA_OV772X +SOC_CAMERA_TW9910 +SOC_CAMERA_PLATFORM + [2.6.26] # Requires struct i2c_device_id VIDEO_TVP514X @@ -19,12 +33,8 @@ VIDEO_TVP514X RADIO_TEA5764 VIDEO_THS7303 VIDEO_ADV7343 - -[2.6.25] -# Requires gpiolib -SOC_CAMERA -SOC_CAMERA_MT9V022 -SOC_CAMERA_MT9M001 +RADIO_SI4713 +I2C_SI4713 [2.6.24] # Some freezer routines |