Mauro, We have few patches already reviewed and ready for merge (See Hans' pull request in the attachment. Could you merge these so that we can base our future patches on this? Thanks Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 email: m-karicheri2@xxxxxx
--- Begin Message ---
- Subject: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
- From: Hans Verkuil <hverkuil@xxxxxxxxx>
- Date: Tue, 10 Nov 2009 11:58:38 -0600
- Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>, "Hiremath, Vaibhav" <hvaibhav@xxxxxx>
- Thread-index: AcpiL3+lCQXwrXLRRrC9kQOtqHUmSw==
- Thread-topic: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
- User-agent: KMail/1.9.9
Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb for the following: - v4l2-spec: add missing V4L2-PIX-FMT-STV0680 description. - decode_tm6000: fix compilation - davinci: remove stray duplicate config pointer - davinci: add missing vpif_capture.c/h files - Davinci VPFE Capture: Specify device pointer in videobuf_queue_dma_contig_init - Davinci VPFE Capture: add i2c adapter id in platform data - Davinci VPFE Capture: Take i2c adapter id through platform data - Davinci VPFE Capture:Replaced IRQ_VDINT1 with vpfe_dev->ccdc_irq1 - V4L2: Added CID's V4L2_CID_ROTATE/BG_COLOR - v4l2 doc: Added ROTATE and BG_COLOR control documentation - Davinci VPFE Capture: Add support for Control ioctls - V4L2: Add Capability and Flag field for Chroma Key - v4l2 doc: Added FBUF_CAP_SRC_CHROMAKEY/FLAG_SRC_CHROMAKEY Note that the third patch (davinci: remove stray duplicate config pointer) is a high-prio bug fix that must go into 2.6.32. I discovered that for some reason the davinci/vpif_capture.c/h files were missing in the v4l-dvb master repo, so they are added back in the fourth patch (I copied them from 2.6.32-rc6). There is one arch patch involved here as well: http://patchwork.kernel.org/patch/53426/ This patch belongs after "Davinci VPFE Capture: add i2c adapter id in platform data" but before "Take i2c adapter id through platform data". The new controls and chromakey cap/flag were originally discussed in January to April this year based on omap patches from Hardik Shah. I actually thought these patches were committed months ago, but they apparently fell on the floor. The original discussion is here: http://www.mail-archive.com/linux-media%40vger.kernel.org/msg00624.html Thanks, Hans diffstat: b/linux/drivers/media/video/davinci/vpif_capture.c | 2168 +++++++++++++++++++++ b/linux/drivers/media/video/davinci/vpif_capture.h | 165 + linux/Documentation/DocBook/v4l/controls.xml | 20 linux/Documentation/DocBook/v4l/pixfmt.xml | 5 linux/Documentation/DocBook/v4l/videodev2.h.xml | 1103 +++++----- linux/Documentation/DocBook/v4l/vidioc-g-fbuf.xml | 17 linux/drivers/media/video/davinci/vpfe_capture.c | 45 linux/drivers/media/video/davinci/vpif_display.c | 1 linux/drivers/media/video/v4l2-common.c | 9 linux/include/linux/videodev2.h | 6 linux/include/media/davinci/vpfe_capture.h | 2 v4l2-apps/util/Makefile | 2 v4l2-apps/util/decode_tm6000.c | 2 13 files changed, 2987 insertions(+), 558 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
--- End Message ---
