Mauro, You might be able to apply my original patch in the attached email. I just want to make sure your merge of vpfe capture to upstream is not blocked.
I have another set of patches based on vpfe capture and it is difficult to create subsequent patches (will have similar merge issues as well) with out getting this to upstream. So please let me know if you have any issues in merging the vpfe capture patch to upstream. I don't want vpfe capture merge blocked because of dm6467 display patch issues. So please let me know if you require any help from me in this regard. I think attached patch might be used to overcome the Makefile issue you have reported. If there is any difficulty in applying this, I can help you to resolve the same. Regards, Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 Phone : 301-515-3736 email: m-kariche...@ti.com >-----Original Message----- >From: Karicheri, Muralidharan >Sent: Tuesday, July 21, 2009 10:32 AM >To: 'Mauro Carvalho Chehab' >Cc: Subrahmanya, Chaithrika; 'Hans Verkuil'; linux-media@vger.kernel.org >Subject: RE: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap > >Mauro and Hans, > >Not sure if you are referring to vpfe capture patch or DM6467 display patch. >I think Makefile and Kconfig changes needs to be cherry picked... > >Murali Karicheri >Software Design Engineer >Texas Instruments Inc. >Germantown, MD 20874 >Phone : 301-515-3736 >email: m-kariche...@ti.com > >>-----Original Message----- >>From: Mauro Carvalho Chehab [mailto:mche...@infradead.org] >>Sent: Tuesday, July 21, 2009 2:46 AM >>To: Karicheri, Muralidharan >>Cc: Subrahmanya, Chaithrika; 'Hans Verkuil'; linux-media@vger.kernel.org >>Subject: Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap >> >>Em Wed, 15 Jul 2009 09:41:53 -0500 >>"Karicheri, Muralidharan" <m-kariche...@ti.com> escreveu: >> >>> Mauro, >>> >>> Thanks for taking care of this. >> >>Anytime. Yet, it seems that those patches depend on Chaithrika DM646x >>patches >>that weren't accepted yet by arm maintainer: >> >>File to patch: linux/drivers/media/video/davinci/Makefile >>linux/drivers/media/video/davinci/Makefile: No such file or directory >> >> >>> Did you also apply dm6467 display >>> patch from Chaithrika? >> >>dm646x is on my -hg tree and on a local branch at one of my -git's. >However, >>I >>can't proceed with this without the ack. >> >> >> >>Cheers, >>Mauro
--- Begin Message ---From: Muralidharan Karicheri <m-kariche...@ti.com> Makefile and config files for the driver This adds Makefile and Kconfig changes to build vpfe capture driver. No change in this version Reviewed by: Hans Verkuil <hverk...@xs4all.nl> Reviewed by: Laurent Pinchart <laurent.pinch...@skynet.be> Signed-off-by: Muralidharan Karicheri <m-kariche...@ti.com> --- Applies to v4l-dvb repository drivers/media/video/Kconfig | 49 ++++++++++++++++++++++++++++++++++ drivers/media/video/Makefile | 2 + drivers/media/video/davinci/Makefile | 9 ++++++ 3 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 drivers/media/video/davinci/Makefile diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 94f4405..8a1bd1c 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -497,6 +497,55 @@ config VIDEO_VIVI Say Y here if you want to test video apps or debug V4L devices. In doubt, say N. +config VIDEO_VPSS_SYSTEM + tristate "VPSS System module driver" + depends on ARCH_DAVINCI + help + Support for vpss system module for video driver + default y + +config VIDEO_VPFE_CAPTURE + tristate "VPFE Video Capture Driver" + depends on VIDEO_V4L2 && ARCH_DAVINCI + select VIDEOBUF_DMA_CONTIG + help + Support for DMXXXX VPFE based frame grabber. This is the + common V4L2 module for following DMXXX SoCs from Texas + Instruments:- DM6446 & DM355. + + To compile this driver as a module, choose M here: the + module will be called vpfe-capture. + +config VIDEO_DM6446_CCDC + tristate "DM6446 CCDC HW module" + depends on ARCH_DAVINCI_DM644x && VIDEO_VPFE_CAPTURE + select VIDEO_VPSS_SYSTEM + default y + help + Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces + with decoder modules such as TVP5146 over BT656 or + sensor module such as MT9T001 over a raw interface. This + module configures the interface and CCDC/ISIF to do + video frame capture from slave decoders. + + To compile this driver as a module, choose M here: the + module will be called vpfe. + +config VIDEO_DM355_CCDC + tristate "DM355 CCDC HW module" + depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE + select VIDEO_VPSS_SYSTEM + default y + help + Enables DM355 CCD hw module. DM355 CCDC hw interfaces + with decoder modules such as TVP5146 over BT656 or + sensor module such as MT9T001 over a raw interface. This + module configures the interface and CCDC/ISIF to do + video frame capture from a slave decoders + + To compile this driver as a module, choose M here: the + module will be called vpfe. + source "drivers/media/video/bt8xx/Kconfig" config VIDEO_PMS diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 7fb3add..1f28495 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -153,6 +153,8 @@ obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o +obj-$(CONFIG_ARCH_DAVINCI) += davinci/ + obj-$(CONFIG_VIDEO_AU0828) += au0828/ obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile new file mode 100644 index 0000000..b84a405 --- /dev/null +++ b/drivers/media/video/davinci/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for the davinci video device drivers. +# + +# Capture: DM6446 and DM355 +obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o +obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o +obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o +obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o -- 1.6.0.4
--- End Message ---
