From: Mauro Carvalho Chehab <mchehab@infradead.org> Forgot to add this file again. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Move tuners to common/tuners There were several issues in the past, caused by the hybrid tuner design, since now, the same tuner can be used by drivers/media/dvb and drivers/media/video. This patch moves those common tuners into a common dir. It also moves saa7146 driver into drivers/media/video, where other hybrid drivers are placed. Kconfig items were rearranged, to split V4L/DVB core from their drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
From: Mauro Carvalho Chehab <mchehab@infradead.org> As pointed by Adrian Bunk, with I2C=m and VIDEO_DEV=y, videodev brokes. This patch moves the functions that videodev needs from v4l2-common. It also fixes some Kconfig changes. After this patch, I2C=m / VIDEO_DEV=y will make v4l2 core statically linked into kernel. v4l2-common will be m, and all V4L drivers will also be m. This approach is very conservative, since it is possible to have V4L drivers that don't need I2C or v4l2-common. The better is to map what drivers really need v4l2-common, making them to select v4l2-common, and allowing the others to be 'y', 'm' and 'n'. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
From: Trent Piepho <xyzzy@speakeasy.org> The ttpci Kconfig file has bugs that cause it to fail in certain Kconfig situations. The basic problem is that it selects certain drivers, but does not depend on the dependencies of those drivers. See http://article.gmane.org/gmane.comp.video.video4linux/35072 Using the Kconfig file also has some annoyances. For instance one can't turn off AV7110 support unless you go down several options and first turn off budget-patch support. Normally user selectable drivers are not forced on like this. The "AV7110 cards with Budget Patch" option is disabled if "Budget cards" isn't on. Normally a driver appears nested under a driver it depends on, but since drivers that don't depend on "Budget cards" are between the two options, the config programs can't display the tree correctly. The Makefile has an issue too. Some modules, ttpci-eeprom and budget-core, appear in the Makefile under several different config symbols. If more than one of these symbols is on, they will get added the to list of objects multiple times. The normal convention is to have a config symbol just the common object(s) and have the users of the that object either depend on or select that config symbol. This patch fixes all these issues. ttpci-eepom is under a new config symbol, and so is the budget-core module. The four different budget card types appear as sub-drivers under a main "SAA7146 DVB cards" option. Turning on budget-patch doesn't force AV7110. Drivers using SAA7146_VV have the necessary VIDEO_DEV dependency, so that it isn't possible to select SAA7146_VV without V4L being on. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
PCI-dependent videobuf_foo methods were renamed as videobuf_pci_foo. Also, videobuf_dmabuf is now part of videobuf-dma-sg private struct. So, to access it, a subroutine call is needed. This patch renames all occurences of those function calls to be consistent with the video-buf split. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981 Reviewed-by: Ricardo Cerqueira <v4l@cerqueira.org>
The recent changes on Kconfig broke compilation when VIDEO_DEV is compiled as module. On some cases, drivers like VIDEO_BUF are compiled with 'y' option instead of 'm': ERROR: "videobuf_read_stop" [drivers/media/video/video-buf-dvb.ko] undefined! ERROR: "videobuf_waiton" [drivers/media/video/video-buf-dvb.ko] undefined! ERROR: "videobuf_read_start" [drivers/media/video/video-buf-dvb.ko] undefined! ERROR: "videobuf_mmap_free" [drivers/media/video/saa7134/saa7134.ko] undefined! ERROR: "videobuf_mmap_mapper" [drivers/media/video/saa7134/saa7134.ko] undefined! ... ERROR: "videobuf_read_stop" [drivers/media/common/saa7146_vv.ko] undefined! ERROR: "videobuf_poll_stream" [drivers/media/common/saa7146_vv.ko] undefined! ERROR: "videobuf_streamoff" [drivers/media/common/saa7146_vv.ko] undefined! Thanks to Toralf Forster <toralf.foerster@gmx.de> for pointing this issue. CC: Toralf Forster <toralf.foerster@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
From: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
From: Mauro Carvalho Chehab <mchehab@infradead.org> Just a few adjustments were required on those drivers to be V4L2 compliant. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
From: Jean Delvare <khali@linux-fr.org> Mixing "depends on I2C" and "select I2C" within the media subsystem leads to the following problem: Warning! Found recursive dependency: I2C DVB_BUDGET DVB_BUDGET_PATCH DVB_AV7110 VIDEO_SAA7146_VV VIDEO_SAA7146 I2C Acked-by: Manu Abraham <manu@llinuxtv,org> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>