Mark Brown wrote:
On Fri, Jan 21, 2011 at 10:36:42AM -0800, Stephen Warren wrote:
Patch 3 (Adds various platform data to arch/arm/mach-tegra) depends on patch 2, and should be checked into the Tegra for-next tree at some later time. You can ignore this patch; I presented it simply to show a complete set of patches. Sorry if the cover letter wasn't clear on this point.
I've no problem carrying that in ASoC if Colin is happy with it, it seems much easier to do that than to have to remember to apply it to the Tegra tree after the 2.6.39 merge window.
I'd like to get everything, or at least most of this, into 2.6.39 if at all possible. I guess getting just the basic driver (i.e. before this addition of internal speaker support) would be OK though, since none of the patches for the basic driver have any cross-subsystem dependencies.
For the basic driver: Everything is already in the ASoC tree. I'll be pushing patches to support it (i.e. add the required platform_data, and possibly various Tegra infra-structure such as clock configuration additions and fixes etc.) to the Tegra for-next tree once it's open to accept patches:
The problem is that the Tegra for-next branch isn't yet open for submissions, (I was originally directed to provide patches against linux-tegra-2.6.36 and just recently directed to provided patches against linux-tegra-2.6.37) so I've been queueing up all the arch/arm-mach-tegra patches for submission once Tegra for-next opens. Colin and Erik have said offline that this will be soon.
Hence, the arch/arm-mach-tegra changes in this patchset (excluding the simple standalone addition of that one new header) build on code that is neither in ASoC's nor Tegra's for-next branch. Hence, you won't be able to carry that patch yourself since it won't apply, even with manual merging I suspect.
Sorry the situation is so confusing. I hope this explains some of the background.