| Message ID | 200907062024.44703.hverkuil@xs4all.nl (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Mauro Carvalho Chehab |
| Headers | show |
Mauro, Could you please let me know what your plans are for this pull request? Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 Phone : 301-515-3736 email: m-karicheri2@ti.com >-----Original Message----- >From: Karicheri, Muralidharan >Sent: Tuesday, July 07, 2009 10:42 AM >To: 'Hans Verkuil'; linux-media@vger.kernel.org >Cc: Mauro Carvalho Chehab >Subject: RE: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap > >Mauro, > >Will you be able to pull this for 2.6.31 ? > >Thanks. > >Murali Karicheri >Software Design Engineer >Texas Instruments Inc. >Germantown, MD 20874 >Phone : 301-515-3736 >email: m-karicheri2@ti.com >>-----Original Message----- >>From: Hans Verkuil [mailto:hverkuil@xs4all.nl] >>Sent: Monday, July 06, 2009 2:25 PM >>To: linux-media@vger.kernel.org >>Cc: Karicheri, Muralidharan; Mauro Carvalho Chehab >>Subject: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap >> >>Hi Mauro, >> >>Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap for >>the following: >> >>- tvp514x: Migration to sub-device framework >>- tvp514x: formatting comments as per kernel documentation >>- v4l: vpfe capture bridge driver for DM355 and DM6446 >>- v4l: ccdc hw device header file for vpfe capture >>- v4l: dm355 ccdc module for vpfe capture driver >>- v4l: dm644x ccdc module for vpfe capture driver >>- v4l: ccdc types used across ccdc modules for vpfe capture driver >>- v4l: common vpss module for video drivers >>- v4l: Makefile and config files for vpfe capture driver >>- v4l: davinci drivers should only be compiled for kernels >= 2.6.31. >> >>Hopefully these changes can be merged into 2.6.31. >> >>I have attached two arch/arm patches that need to be applied to the git >>tree. >>These patches should be applied after merging this tree. >> >>I've compiled this driver against the latest Linus' git tree. >> >>Thanks, >> >> Hans >> >>diffstat: >> b/linux/drivers/media/video/davinci/ccdc_hw_device.h | 110 >> b/linux/drivers/media/video/davinci/dm355_ccdc.c | 978 +++++++ >> b/linux/drivers/media/video/davinci/dm355_ccdc_regs.h | 310 ++ >> b/linux/drivers/media/video/davinci/dm644x_ccdc.c | 878 +++++++ >> b/linux/drivers/media/video/davinci/dm644x_ccdc_regs.h | 145 + >> b/linux/drivers/media/video/davinci/vpfe_capture.c | 2124 >>+++++++++++++++++ >> b/linux/drivers/media/video/davinci/vpss.c | 301 ++ >> b/linux/include/media/davinci/ccdc_types.h | 43 >> b/linux/include/media/davinci/dm355_ccdc.h | 321 ++ >> b/linux/include/media/davinci/dm644x_ccdc.h | 184 + >> b/linux/include/media/davinci/vpfe_capture.h | 198 + >> b/linux/include/media/davinci/vpfe_types.h | 51 >> b/linux/include/media/davinci/vpss.h | 69 >> linux/drivers/media/video/Kconfig | 49 >> linux/drivers/media/video/Makefile | 2 >> linux/drivers/media/video/davinci/Makefile | 6 >> linux/drivers/media/video/tvp514x.c | 1154 ++++----- >> linux/drivers/media/video/tvp514x_regs.h | 10 >> linux/include/media/tvp514x.h | 4 >> v4l/versions.txt | 7 >> 20 files changed, 6284 insertions(+), 660 deletions(-) >> >>-- >>Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom
Em Mon, 6 Jul 2009 20:24:44 +0200 Hans Verkuil <hverkuil@xs4all.nl> escreveu: > Hi Mauro, > > Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap for the following: > > - tvp514x: Migration to sub-device framework > - tvp514x: formatting comments as per kernel documentation > - v4l: vpfe capture bridge driver for DM355 and DM6446 > - v4l: ccdc hw device header file for vpfe capture > - v4l: dm355 ccdc module for vpfe capture driver > - v4l: dm644x ccdc module for vpfe capture driver > - v4l: ccdc types used across ccdc modules for vpfe capture driver > - v4l: common vpss module for video drivers > - v4l: Makefile and config files for vpfe capture driver > - v4l: davinci drivers should only be compiled for kernels >= 2.6.31. > > Hopefully these changes can be merged into 2.6.31. > > I have attached two arch/arm patches that need to be applied to the git tree. > These patches should be applied after merging this tree. I'm not seeing Rusell (arm maintainer) ack on those patches. Could you please send him those patches C/C me, and asking his ack? Btw. I'm still waiting for the fixes asked by him in order to forward the arm dm646x patch (and the rest of the series) upstream. Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Thu, 9 Jul 2009 09:18:47 -0500 "Karicheri, Muralidharan" <m-karicheri2@ti.com> escreveu: > Mauro, > > Could you please let me know what your plans are for this pull request? Murali, The arm Maintainer should ack on the patches that touch arch/arm. After having it, I'll analyze the patches again and, if not too late, and if Russell acks on having this for 2.6.31, I'll send it upstream. Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mauro, Thanks for your support. I will wait for the comments. Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 Phone : 301-515-3736 email: m-karicheri2@ti.com >-----Original Message----- >From: Mauro Carvalho Chehab [mailto:mchehab@infradead.org] >Sent: Friday, July 10, 2009 4:25 PM >To: Karicheri, Muralidharan >Cc: Hans Verkuil; linux-media@vger.kernel.org >Subject: Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap > >Em Thu, 9 Jul 2009 09:18:47 -0500 >"Karicheri, Muralidharan" <m-karicheri2@ti.com> escreveu: > >> Mauro, >> >> Could you please let me know what your plans are for this pull request? > >Murali, > >The arm Maintainer should ack on the patches that touch arch/arm. After >having >it, I'll analyze the patches again and, if not too late, and if Russell >acks on >having this for 2.6.31, I'll send it upstream. > > > >Cheers, >Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Oops! I thought you are going to merge the pull request from Hans and send them for comments like you did for DM6467 patches. Please confirm. Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 Phone : 301-515-3736 email: m-karicheri2@ti.com >-----Original Message----- >From: Karicheri, Muralidharan >Sent: Friday, July 10, 2009 4:51 PM >To: 'Mauro Carvalho Chehab' >Cc: Hans Verkuil; linux-media@vger.kernel.org >Subject: RE: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap > >Mauro, > >Thanks for your support. I will wait for the comments. > >Murali Karicheri >Software Design Engineer >Texas Instruments Inc. >Germantown, MD 20874 >Phone : 301-515-3736 >email: m-karicheri2@ti.com > >>-----Original Message----- >>From: Mauro Carvalho Chehab [mailto:mchehab@infradead.org] >>Sent: Friday, July 10, 2009 4:25 PM >>To: Karicheri, Muralidharan >>Cc: Hans Verkuil; linux-media@vger.kernel.org >>Subject: Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap >> >>Em Thu, 9 Jul 2009 09:18:47 -0500 >>"Karicheri, Muralidharan" <m-karicheri2@ti.com> escreveu: >> >>> Mauro, >>> >>> Could you please let me know what your plans are for this pull request? >> >>Murali, >> >>The arm Maintainer should ack on the patches that touch arch/arm. After >>having >>it, I'll analyze the patches again and, if not too late, and if Russell >>acks on >>having this for 2.6.31, I'll send it upstream. >> >> >> >>Cheers, >>Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Fri, 10 Jul 2009 15:54:21 -0500 "Karicheri, Muralidharan" <m-karicheri2@ti.com> escreveu: > Oops! > > I thought you are going to merge the pull request from Hans > and send them for comments like you did for DM6467 patches. In the case of dm6467, I only noticed the lack of Russell ack after merging it at -hg. Due to that, I needed to do a hack on my local -git copy. It is much better if we do the opposite: get first the arm ack, and then merge everything on -hg and -git. In order to speedup the process, could you please send the two patches to Russell, c/c me and linux-media ML (one patch per email, inlined)? Thanks, Mauro. Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mauro, Please excuse me to ask these silly questions. Since I am not much familiar with the process, I need some help here. The arm patches are attached in Hans original pull request. Is it Okay to 1) forward the same to Russel, cc you and request his comment or 2) forward the original patches I had sent to Hans. In the case of DaVinci drivers, Hans is integrating and sending pull request. So option 1) seems right to me. Any comments? Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 Phone : 301-515-3736 email: m-karicheri2@ti.com >-----Original Message----- >From: Mauro Carvalho Chehab [mailto:mchehab@infradead.org] >Sent: Friday, July 10, 2009 5:08 PM >To: Karicheri, Muralidharan >Cc: Karicheri, Muralidharan; Hans Verkuil; linux-media@vger.kernel.org >Subject: Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap > >Em Fri, 10 Jul 2009 15:54:21 -0500 >"Karicheri, Muralidharan" <m-karicheri2@ti.com> escreveu: > >> Oops! >> >> I thought you are going to merge the pull request from Hans >> and send them for comments like you did for DM6467 patches. > >In the case of dm6467, I only noticed the lack of Russell ack after merging >it >at -hg. Due to that, I needed to do a hack on my local -git copy. It is >much >better if we do the opposite: get first the arm ack, and then merge >everything >on -hg and -git. > >In order to speedup the process, could you please send the two patches to >Russell, c/c me and linux-media ML (one patch per email, inlined)? > >Thanks, >Mauro. > > > >Cheers, >Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mauro, I have forwarded the two patches to Russell as asked in your email. Let me if it doesn't look right. Thanks. Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 Phone : 301-515-3736 email: m-karicheri2@ti.com >-----Original Message----- >From: Mauro Carvalho Chehab [mailto:mchehab@infradead.org] >Sent: Friday, July 10, 2009 4:20 PM >To: Hans Verkuil >Cc: linux-media@vger.kernel.org; Karicheri, Muralidharan >Subject: Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap > >Em Mon, 6 Jul 2009 20:24:44 +0200 >Hans Verkuil <hverkuil@xs4all.nl> escreveu: > >> Hi Mauro, >> >> Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap for >the following: >> >> - tvp514x: Migration to sub-device framework >> - tvp514x: formatting comments as per kernel documentation >> - v4l: vpfe capture bridge driver for DM355 and DM6446 >> - v4l: ccdc hw device header file for vpfe capture >> - v4l: dm355 ccdc module for vpfe capture driver >> - v4l: dm644x ccdc module for vpfe capture driver >> - v4l: ccdc types used across ccdc modules for vpfe capture driver >> - v4l: common vpss module for video drivers >> - v4l: Makefile and config files for vpfe capture driver >> - v4l: davinci drivers should only be compiled for kernels >= 2.6.31. >> >> Hopefully these changes can be merged into 2.6.31. >> >> I have attached two arch/arm patches that need to be applied to the git >tree. >> These patches should be applied after merging this tree. > >I'm not seeing Rusell (arm maintainer) ack on those patches. Could you >please >send him those patches C/C me, and asking his ack? > >Btw. I'm still waiting for the fixes asked by him in order to forward the >arm >dm646x patch (and the rest of the series) upstream. > > > >Cheers, >Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Fri, 10 Jul 2009 16:13:05 -0500 "Karicheri, Muralidharan" <m-karicheri2@ti.com> escreveu: > Mauro, > > Please excuse me to ask these silly questions. Since I am not much familiar with the process, I need some help here. > > The arm patches are attached in Hans original pull request. Is it Okay to 1) forward the same to Russel, cc you and request his comment or 2) forward the original patches I had sent to Hans. In the case of DaVinci drivers, Hans is integrating and sending pull request. So option 1) seems right to me. Kernel maintainers don't like to see more than one patch per email, since this breaks all merge scripts and require manual work. So, people should always send one patch per email. So, answering your question, (2) is the proper way. You should warn Russell that the merge will happen via my tree, to avoid merge conflicts between his and my tree. Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Fri, 10 Jul 2009 16:35:09 -0500 "Karicheri, Muralidharan" <m-karicheri2@ti.com> escreveu: > Mauro, > > I have forwarded the two patches to Russell as asked in your email. Let me if it doesn't look right. OK. The emails you sent him is the proper way ;) Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Jul 11, 2009 at 01:49:46, Mauro Carvalho Chehab wrote: > Em Mon, 6 Jul 2009 20:24:44 +0200 > Hans Verkuil <hverkuil@xs4all.nl> escreveu: > > > Hi Mauro, > > > > Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap for the following: > > > > - tvp514x: Migration to sub-device framework > > - tvp514x: formatting comments as per kernel documentation > > - v4l: vpfe capture bridge driver for DM355 and DM6446 > > - v4l: ccdc hw device header file for vpfe capture > > - v4l: dm355 ccdc module for vpfe capture driver > > - v4l: dm644x ccdc module for vpfe capture driver > > - v4l: ccdc types used across ccdc modules for vpfe capture driver > > - v4l: common vpss module for video drivers > > - v4l: Makefile and config files for vpfe capture driver > > - v4l: davinci drivers should only be compiled for kernels >= 2.6.31. > > > > Hopefully these changes can be merged into 2.6.31. > > > > I have attached two arch/arm patches that need to be applied to the git tree. > > These patches should be applied after merging this tree. > > I'm not seeing Rusell (arm maintainer) ack on those patches. Could you please > send him those patches C/C me, and asking his ack? > > Btw. I'm still waiting for the fixes asked by him in order to forward the arm > dm646x patch (and the rest of the series) upstream. > Mauro, I have submitted the updated patch last week[1]. I have marked linux@arm.linux.org.uk in cc. A patch for VPIF updates has also been posted[2] . Regards, Chaithrika [1] http://www.mail-archive.com/linux-media@vger.kernel.org/msg07385.html [2] http://www.mail-archive.com/linux-media@vger.kernel.org/msg07384.html > > > Cheers, > Mauro > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Regards, Chaithrika -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Tue, 14 Jul 2009 10:24:19 +0530 "chaithrika" <chaithrika@ti.com> escreveu: > On Sat, Jul 11, 2009 at 01:49:46, Mauro Carvalho Chehab wrote: > > Em Mon, 6 Jul 2009 20:24:44 +0200 > > Hans Verkuil <hverkuil@xs4all.nl> escreveu: > > > > > Hi Mauro, > > > > > > Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap > for the following: > > > > > > - tvp514x: Migration to sub-device framework > > > - tvp514x: formatting comments as per kernel documentation > > > - v4l: vpfe capture bridge driver for DM355 and DM6446 > > > - v4l: ccdc hw device header file for vpfe capture > > > - v4l: dm355 ccdc module for vpfe capture driver > > > - v4l: dm644x ccdc module for vpfe capture driver > > > - v4l: ccdc types used across ccdc modules for vpfe capture driver > > > - v4l: common vpss module for video drivers > > > - v4l: Makefile and config files for vpfe capture driver > > > - v4l: davinci drivers should only be compiled for kernels >= 2.6.31. > > > > > > Hopefully these changes can be merged into 2.6.31. > > > > > > I have attached two arch/arm patches that need to be applied to the git > tree. > > > These patches should be applied after merging this tree. > > > > I'm not seeing Rusell (arm maintainer) ack on those patches. Could you > please > > send him those patches C/C me, and asking his ack? > > > > Btw. I'm still waiting for the fixes asked by him in order to forward the > arm > > dm646x patch (and the rest of the series) upstream. > > > > Mauro, > > I have submitted the updated patch last week[1]. I have marked > linux@arm.linux.org.uk in cc. > > A patch for VPIF updates has also been posted[2] . Applied on my tree. Not sure if I'll send this week upstream. My middle finger was damaged due to a very heavy box that fall on it, and it is hard for me to type with it immobilized. > Regards, > Chaithrika > > [1] http://www.mail-archive.com/linux-media@vger.kernel.org/msg07385.html > [2] http://www.mail-archive.com/linux-media@vger.kernel.org/msg07384.html > > > > > > > Cheers, > > Mauro > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-media" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > > Regards, > Chaithrika > > Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mauro, Thanks for taking care of this. Did you also apply dm6467 display patch from Chaithrika? <Snip> >> linux@arm.linux.org.uk in cc. >> >> A patch for VPIF updates has also been posted[2] . > >Applied on my tree. Not sure if I'll send this week upstream. My middle >finger was damaged due to a very heavy box that fall on it, and it is hard >for me to type with it immobilized. > Sorry to hear that. Hope you recover soon. Take care, Murali. >> Regards, >> Chaithrika >> >> [1] http://www.mail-archive.com/linux-media@vger.kernel.org/msg07385.html >> [2] http://www.mail-archive.com/linux-media@vger.kernel.org/msg07384.html >> >> > >> > >> > Cheers, >> > Mauro >> > -- >> > To unsubscribe from this list: send the line "unsubscribe linux-media" >in >> > the body of a message to majordomo@vger.kernel.org >> > More majordomo info at http://vger.kernel.org/majordomo-info.html >> > >> >> >> Regards, >> Chaithrika >> >> > > > > >Cheers, >Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Wed, 15 Jul 2009 09:41:53 -0500 "Karicheri, Muralidharan" <m-karicheri2@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 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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-karicheri2@ti.com >-----Original Message----- >From: Mauro Carvalho Chehab [mailto:mchehab@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-karicheri2@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 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: m-karicheri2@ti.com To: hverkuil@xs4all.nl, mchehab@infradead.org Cc: Muralidharan Karicheri <m-karicheri2@ti.com> Subject: [PATCH 7/11 - v3] DM355 platform changes for vpfe capture driver Date: Mon, 6 Jul 2009 13:32:45 -0400 From: Muralidharan Karicheri <m-karicheri2@ti.com> DM355 platform and board setup This has platform and board setup changes to support vpfe capture driver for DM355 EVMs. Reviewed by: Hans Verkuil <hverkuil@xs4all.nl> Reviewed by: Laurent Pinchart <laurent.pinchart@skynet.be> Reviewed by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed by: David Brownell <david-b@pacbell.net> Signed-off-by: Muralidharan Karicheri <m-karicheri2@ti.com> --- Applies to Linus' GIT Tree arch/arm/mach-davinci/board-dm355-evm.c | 76 ++++++++++++++++++++++++- arch/arm/mach-davinci/dm355.c | 83 ++++++++++++++++++++++++++++ arch/arm/mach-davinci/include/mach/dm355.h | 2 + arch/arm/mach-davinci/include/mach/mux.h | 9 +++ 4 files changed, 167 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 5ac2f56..605bf03 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -20,6 +20,8 @@ #include <linux/io.h> #include <linux/gpio.h> #include <linux/clk.h> +#include <linux/videodev2.h> +#include <media/tvp514x.h> #include <linux/spi/spi.h> #include <linux/spi/eeprom.h> @@ -135,11 +137,11 @@ static void dm355evm_mmcsd_gpios(unsigned gpio) } static struct i2c_board_info dm355evm_i2c_info[] = { - { I2C_BOARD_INFO("dm355evm_msp", 0x25), + { I2C_BOARD_INFO("dm355evm_msp", 0x25), .platform_data = dm355evm_mmcsd_gpios, - /* plus irq */ }, + }, + /* { plus irq }, */ /* { I2C_BOARD_INFO("tlv320aic3x", 0x1b), }, */ - /* { I2C_BOARD_INFO("tvp5146", 0x5d), }, */ }; static void __init evm_init_i2c(void) @@ -178,6 +180,72 @@ static struct platform_device dm355evm_dm9000 = { .num_resources = ARRAY_SIZE(dm355evm_dm9000_rsrc), }; +static struct tvp514x_platform_data tvp5146_pdata = { + .clk_polarity = 0, + .hs_polarity = 1, + .vs_polarity = 1 +}; + +#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) +/* Inputs available at the TVP5146 */ +static struct v4l2_input tvp5146_inputs[] = { + { + .index = 0, + .name = "Composite", + .type = V4L2_INPUT_TYPE_CAMERA, + .std = TVP514X_STD_ALL, + }, + { + .index = 1, + .name = "S-Video", + .type = V4L2_INPUT_TYPE_CAMERA, + .std = TVP514X_STD_ALL, + }, +}; + +/* + * this is the route info for connecting each input to decoder + * ouput that goes to vpfe. There is a one to one correspondence + * with tvp5146_inputs + */ +static struct vpfe_route tvp5146_routes[] = { + { + .input = INPUT_CVBS_VI2B, + .output = OUTPUT_10BIT_422_EMBEDDED_SYNC, + }, + { + .input = INPUT_SVIDEO_VI2C_VI1C, + .output = OUTPUT_10BIT_422_EMBEDDED_SYNC, + }, +}; + +static struct vpfe_subdev_info vpfe_sub_devs[] = { + { + .name = "tvp5146", + .grp_id = 0, + .num_inputs = ARRAY_SIZE(tvp5146_inputs), + .inputs = tvp5146_inputs, + .routes = tvp5146_routes, + .can_route = 1, + .ccdc_if_params = { + .if_type = VPFE_BT656, + .hdpol = VPFE_PINPOL_POSITIVE, + .vdpol = VPFE_PINPOL_POSITIVE, + }, + .board_info = { + I2C_BOARD_INFO("tvp5146", 0x5d), + .platform_data = &tvp5146_pdata, + }, + } +}; + +static struct vpfe_config vpfe_cfg = { + .num_subdevs = ARRAY_SIZE(vpfe_sub_devs), + .sub_devs = vpfe_sub_devs, + .card_name = "DM355 EVM", + .ccdc = "DM355 CCDC", +}; + static struct platform_device *davinci_evm_devices[] __initdata = { &dm355evm_dm9000, &davinci_nand_device, @@ -189,6 +257,8 @@ static struct davinci_uart_config uart_config __initdata = { static void __init dm355_evm_map_io(void) { + /* setup input configuration for VPFE input devices */ + dm355_set_vpfe_config(&vpfe_cfg); dm355_init(); } diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index baaaf32..2696df1 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -481,6 +481,14 @@ INT_CFG(DM355, INT_EDMA_TC1_ERR, 4, 1, 1, false) EVT_CFG(DM355, EVT8_ASP1_TX, 0, 1, 0, false) EVT_CFG(DM355, EVT9_ASP1_RX, 1, 1, 0, false) EVT_CFG(DM355, EVT26_MMC0_RX, 2, 1, 0, false) + +MUX_CFG(DM355, VIN_PCLK, 0, 14, 1, 1, false) +MUX_CFG(DM355, VIN_CAM_WEN, 0, 13, 1, 1, false) +MUX_CFG(DM355, VIN_CAM_VD, 0, 12, 1, 1, false) +MUX_CFG(DM355, VIN_CAM_HD, 0, 11, 1, 1, false) +MUX_CFG(DM355, VIN_YIN_EN, 0, 10, 1, 1, false) +MUX_CFG(DM355, VIN_CINL_EN, 0, 0, 0xff, 0x55, false) +MUX_CFG(DM355, VIN_CINH_EN, 0, 8, 3, 3, false) #endif }; @@ -604,6 +612,67 @@ static struct platform_device dm355_edma_device = { .resource = edma_resources, }; +static struct resource dm355_vpss_resources[] = { + { + /* VPSS BL Base address */ + .name = "vpss", + .start = 0x01c70800, + .end = 0x01c70800 + 0xff, + .flags = IORESOURCE_MEM, + }, + { + /* VPSS CLK Base address */ + .name = "vpss", + .start = 0x01c70000, + .end = 0x01c70000 + 0xf, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device dm355_vpss_device = { + .name = "vpss", + .id = -1, + .dev.platform_data = "dm355_vpss", + .num_resources = ARRAY_SIZE(dm355_vpss_resources), + .resource = dm355_vpss_resources, +}; + +static struct resource vpfe_resources[] = { + { + .start = IRQ_VDINT0, + .end = IRQ_VDINT0, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_VDINT1, + .end = IRQ_VDINT1, + .flags = IORESOURCE_IRQ, + }, + /* CCDC Base address */ + { + .flags = IORESOURCE_MEM, + .start = 0x01c70600, + .end = 0x01c70600 + 0x1ff, + }, +}; + +static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32); +static struct platform_device vpfe_capture_dev = { + .name = CAPTURE_DRV_NAME, + .id = -1, + .num_resources = ARRAY_SIZE(vpfe_resources), + .resource = vpfe_resources, + .dev = { + .dma_mask = &vpfe_capture_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +void dm355_set_vpfe_config(struct vpfe_config *cfg) +{ + vpfe_capture_dev.dev.platform_data = cfg; +} + /*----------------------------------------------------------------------*/ static struct map_desc dm355_io_desc[] = { @@ -725,6 +794,20 @@ static int __init dm355_init_devices(void) davinci_cfg_reg(DM355_INT_EDMA_CC); platform_device_register(&dm355_edma_device); + platform_device_register(&dm355_vpss_device); + /* + * setup Mux configuration for vpfe input and register + * vpfe capture platform device + */ + davinci_cfg_reg(DM355_VIN_PCLK); + davinci_cfg_reg(DM355_VIN_CAM_WEN); + davinci_cfg_reg(DM355_VIN_CAM_VD); + davinci_cfg_reg(DM355_VIN_CAM_HD); + davinci_cfg_reg(DM355_VIN_YIN_EN); + davinci_cfg_reg(DM355_VIN_CINL_EN); + davinci_cfg_reg(DM355_VIN_CINH_EN); + platform_device_register(&vpfe_capture_dev); + return 0; } postcore_initcall(dm355_init_devices); diff --git a/arch/arm/mach-davinci/include/mach/dm355.h b/arch/arm/mach-davinci/include/mach/dm355.h index 54903b7..e28713c 100644 --- a/arch/arm/mach-davinci/include/mach/dm355.h +++ b/arch/arm/mach-davinci/include/mach/dm355.h @@ -12,11 +12,13 @@ #define __ASM_ARCH_DM355_H #include <mach/hardware.h> +#include <media/davinci/vpfe_capture.h> struct spi_board_info; void __init dm355_init(void); void dm355_init_spi0(unsigned chipselect_mask, struct spi_board_info *info, unsigned len); +void dm355_set_vpfe_config(struct vpfe_config *cfg); #endif /* __ASM_ARCH_DM355_H */ diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index 2737845..f288063 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -154,6 +154,15 @@ enum davinci_dm355_index { DM355_EVT8_ASP1_TX, DM355_EVT9_ASP1_RX, DM355_EVT26_MMC0_RX, + + /* Video In Pin Mux */ + DM355_VIN_PCLK, + DM355_VIN_CAM_WEN, + DM355_VIN_CAM_VD, + DM355_VIN_CAM_HD, + DM355_VIN_YIN_EN, + DM355_VIN_CINL_EN, + DM355_VIN_CINH_EN, }; #ifdef CONFIG_DAVINCI_MUX -- 1.6.0.4
Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap for the following: - tvp514x: Migration to sub-device framework - tvp514x: formatting comments as per kernel documentation - v4l: vpfe capture bridge driver for DM355 and DM6446 - v4l: ccdc hw device header file for vpfe capture - v4l: dm355 ccdc module for vpfe capture driver - v4l: dm644x ccdc module for vpfe capture driver - v4l: ccdc types used across ccdc modules for vpfe capture driver - v4l: common vpss module for video drivers - v4l: Makefile and config files for vpfe capture driver - v4l: davinci drivers should only be compiled for kernels >= 2.6.31. Hopefully these changes can be merged into 2.6.31. I have attached two arch/arm patches that need to be applied to the git tree. These patches should be applied after merging this tree. I've compiled this driver against the latest Linus' git tree. Thanks, Hans diffstat: b/linux/drivers/media/video/davinci/ccdc_hw_device.h | 110 b/linux/drivers/media/video/davinci/dm355_ccdc.c | 978 +++++++ b/linux/drivers/media/video/davinci/dm355_ccdc_regs.h | 310 ++ b/linux/drivers/media/video/davinci/dm644x_ccdc.c | 878 +++++++ b/linux/drivers/media/video/davinci/dm644x_ccdc_regs.h | 145 + b/linux/drivers/media/video/davinci/vpfe_capture.c | 2124 +++++++++++++++++ b/linux/drivers/media/video/davinci/vpss.c | 301 ++ b/linux/include/media/davinci/ccdc_types.h | 43 b/linux/include/media/davinci/dm355_ccdc.h | 321 ++ b/linux/include/media/davinci/dm644x_ccdc.h | 184 + b/linux/include/media/davinci/vpfe_capture.h | 198 + b/linux/include/media/davinci/vpfe_types.h | 51 b/linux/include/media/davinci/vpss.h | 69 linux/drivers/media/video/Kconfig | 49 linux/drivers/media/video/Makefile | 2 linux/drivers/media/video/davinci/Makefile | 6 linux/drivers/media/video/tvp514x.c | 1154 ++++----- linux/drivers/media/video/tvp514x_regs.h | 10 linux/include/media/tvp514x.h | 4 v4l/versions.txt | 7 20 files changed, 6284 insertions(+), 660 deletions(-)