On Wed, Mar 26, 2008 at 01:52:39PM +0000, Oliver Ford wrote:

The machine no longer reboots out of linux though. I assume there were some changes in 2.6.25-rc4 mainline that aren't in the asoc-v2-dev yet. I will wait for the pxa3xx stuff to be merged into the mainline for this. What version of the mainline kernel is the latest asoc-v2-dev branch based on. (I'm still a little hazy on the git stuff I'm afraid).

The last version that was merged in appears to be 2.6.25-rc2 (say 'git log' then search for 'Merge.*v2.6'). For production use I would recommend going with ASoC v1 at the moment. The PXA3xx support should be straightforward to backport (I wouldn't be suprised if the patches introducing it could just applied against mainline but I've not actually tried yet).

...

I know that there are a number of users currently using the tree for that use case so the asoc-v2-dev branch should hopefully work for you. If you run into trouble please let me know.

The WM97xx touchscreen driver only appears to be in the linux-2.6-touch repository (dev branch, iirc), rather than linux-2.6-asoc where the pxa3xx support is. Since I want both the wm97xx touchscreen and pxa3xx support, is there a simple way I can get the necessary changes in one applied to the other?

You can track both multiple git trees using the remotes feature of git - see git-remote(1) for usage information. For example, this:

git remote add wolfson-touch \ git://opensource.wolfsonmicro.com/linux-2.6-touch

will tell git to track the Wolfson touch drivers using the name 'wolfson-touch'. If you do that and then say:

git remote update git merge wolfson-touch/dev

it will fetch the current state of all remote trees it knows about and then merge the current dev branch of the Wolfson touch drivers git into your current working copy.

The touchscreen drivers and git usage are both rather off-topic for either list, though - probably best to follow up off-list or on linux-input.