Mark Brown <[email protected]> writes: > On Tue, Aug 25, 2009 at 02:18:58PM +0300, Kevin Hilman wrote: > >> So, I went to remedy this, and now I'm getting several other build >> failures[2] when combining davinci git and Mark's for-2.6.32 branch. >> Are there some outstanding patches that are missing here? > > No, it's that Ben's update to the board files to register the tlv320aic3x > I2C device didn't update all the various DaVinci EVMs correctly. The > relevant commit is aa6b904e66d5f484bd52763d63259b9a16f6e107 - it needs a > followon to handle the other EVMs. Ultimately the CODEC should just be > registered under arch/arm so just doing that at once would be good > providing it doesn't create any merge issues. > > Will you take a look at this, Kevin? If not I'll try but it'd be nice > to check on real hardware as well if possible.
OK, I pushed a new temp/asoc branch which is my master branch with your for-2.6.32 branch, followed by two patches for review/test. The first adds the i2c init to the davinci board files, the 2nd drops it from sound/soc/davinci/davinci-evm.c. I did it in two patches so I can merge the arch/arm/* one and you can merge the sound/* one since otherwise, we'll get conflicts to to lots of other board file changes in my tree. Unfortunately, I'm currently on the road and while I have remote access to my davinci hw, it doesn't help for testing audio. ;) Someone from TI will have to test these and verify that the i2c addresses are still right and sound still plays fine. I have only tested that it builds. >> For others to test, I pushed a new 'temp/asoc' branch to DaVinci git >> which is my master branch merged with Mark's for-2.6.31 and for-2.6.32 >> branches (which have been updated since I last merged them.) > > There should be no need to merge for-2.6.31 explicitly, I always keep > the fixes branch merged into the current development version. ok, good to know. Kevin _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
