"Karicheri, Muralidharan" <m-kariche...@ti.com> writes: > I think for developers like me, it is best bet to create the > architecture part of the patches w.r.t davinci tree that you maintain > and v4l patches using linux-next of the v4l-dbv tree.
That's OK with me, as long as you can ensure that things build. > I had used all of Chaithrika's patches including architecture > part. What I have seen is the board and platform files on linux-next > is not the latest. So I had to manually merge the changes. Yes, you have to merge the two together as Mauro's tree only has V4L2 related changes. All the other board/platform file changes are in DaVinci git and queued for linux-next that way. > For testing it is best to use the davinci tree as it is the latest and > greatest for davinci platforms. Yet, for testing some drivers that are going upstream via different trees, you will sometimes have to merge DaVinci git with another upstream tree for testing. Kevin > Murali Karicheri Software Design Engineer Texas Instruments Inc. > Germantown, MD 20874 new phone: 301-407-9583 Old Phone : 301-515-3736 > (will be deprecated) email: m-kariche...@ti.com > >>-----Original Message----- >>From: Kevin Hilman [mailto:khil...@deeprootsystems.com] >>Sent: Friday, August 07, 2009 7:59 PM >>To: Karicheri, Muralidharan >>Cc: Narnakaje, Snehaprabha; >> davinci-linux-open-source@linux.davincidsp.com; >>Mauro Carvalho Chehab; mche...@infradead.org >>Subject: Re: linux-next on V4L-DVB repository not booting up on >> DM6467 evm >> >>"Karicheri, Muralidharan" <m-kariche...@ti.com> writes: >> >>> linux-next branch on v4l-dvb has added vpfe and vpif drivers. I >>> have tried building DM646x with vpif display driver and loaded onto >>> my DM6467 evm. But it doesn't boot up. So I am wondering if >>> relevant board specific changes are available onto this branch. >> >>More than likely you're missing Chaithrika's patch: >> [PATCH v4] ARM: DaVinci: DM646x Video: Platform and board specific >> setup >> >>which wasn't in either davinci git or Mauro's queue. >> >>> Any idea if I need to test this branch or wait for this to be >>> merged to davinci tree and test it on the davinci tree. What is the >>> plan for adding these to your davinci tree? In my understanding, I >>> can use davinci tree for testing and V4l-DVB for patch >>> submission. Do you know if this is fine? I have copied Mauro also >>> to this email for his comment. >> >>If that doesn't work, there may be some other platform support >>that has gone via davinci git. >> >>You should probably use DaVinci git merged with Mauro's next branch. >>You will have to resolve several conflicts that are simple to resolve >>because DaVinci has a bunch of platform updates and so does Mauro's >>branch. They are trivial to resolve since they both add new code to >>the same place. >> >>Hope that helps, >> >>Kevin _______________________________________________ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
