Hans, Thanks for this pull request.. >I gather that Murali and you have figured out the right order to merge this, >so >I leave the details to the both of you. Not really :( I haven't seen a response to my last email on this. >Note that I agree with Mauro's suggestion that the v4l parts of the >platform code are split off into a separate platform source. That would >make it much easier to make changes in the platform code for v4l devices >without running into conflicts with non-v4l platform code changes. We could >even make that v4l platform source part of the hg tree. Do you suggest creating separate arch part source for hg tree and upstream? (I see you have arch folders in the hg tree, but only few architectures currently supported mx*/px*). If so, how is the upstream merge of arch code handled in your case? My question is when the v4l part is merged, the corresponding arch part has to be merged as well to compile the upstream code base. So this is not going to solve the issue that we are facing currently. May be I am not getting the full picture here. BTW, I am okay to have an account in the hg tree. Is there a quick tutorial to understand the process and tools needed to get me started? Regards, Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 phone: 301-407-9583 email: m-karicheri2@xxxxxx >-----Original Message----- >From: Hans Verkuil [mailto:hverkuil@xxxxxxxxx] >Sent: Wednesday, December 30, 2009 8:49 AM >To: linux-media@xxxxxxxxxxxxxxx >Cc: Mauro Carvalho Chehab; Karicheri, Muralidharan; >khilman@xxxxxxxxxxxxxxxxxxx >Subject: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-davinci > >Hi Mauro, > >Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-davinci for >the following: > >- v4l: vpfe_capture: remove clock and ccdc resource handling >- v4l: vpfe capture: convert dm355 ccdc driver to a platform driver >- v4l: vpfe capture: convert dm644x ccdc module to a platform driver >- V4L: vpfe capture: header files for ISIF driver >- V4L: vpfe capture: source for ISIF driver on DM365 >- V4L: vpfe capture: vpss driver enhancements for DM365 >- V4L: vpfe_capture: bug fixes and enhancements >- V4L: vpfe capture: build environment for isif driver > >And after the first three patches are pulled in, then this arch patch >should also be >merged for git: > >http://patchwork.kernel.org/patch/67669/ > >And after the other four patches are pulled in, then this arch patch should >be merged >for git: > >http://patchwork.kernel.org/patch/68876/ > > >Note that I agree with Mauro's suggestion that the v4l parts of the >platform >code are split off into a separate platform source. That would make it much >easier to make changes in the platform code for v4l devices without running >into conflicts with non-v4l platform code changes. We could even make that >v4l platform source part of the hg tree. > >I also think it is a good idea if you ask for an account on linuxtv.org so >that you can set up your own hg trees and you don't have to wait for me. > >Thanks, > > Hans > >diffstat: > b/linux/drivers/media/video/davinci/isif.c | 1512 >+++++++++++++++++++++++ > b/linux/drivers/media/video/davinci/isif_regs.h | 269 ++++ > b/linux/include/media/davinci/isif.h | 531 ++++++++ > linux/drivers/media/video/Kconfig | 14 > linux/drivers/media/video/davinci/Makefile | 1 > linux/drivers/media/video/davinci/dm355_ccdc.c | 413 +++--- > linux/drivers/media/video/davinci/dm644x_ccdc.c | 362 +++-- > linux/drivers/media/video/davinci/vpfe_capture.c | 254 +-- > linux/drivers/media/video/davinci/vpss.c | 289 +++- > linux/include/media/davinci/vpfe_capture.h | 12 > linux/include/media/davinci/vpss.h | 41 > 11 files changed, 3180 insertions(+), 518 deletions(-) > >-- >Hans Verkuil - video4linux developer - sponsored by TANDBERG ��.n��������+%������w��{.n�����{��g����^n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�m
