[PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa

[Eric Miao]

On Tue, Mar 16, 2010 at 9:23 PM, Mark Brown
<broonie at opensource.wolfsonmicro.com> wrote:
> On Tue, Mar 16, 2010 at 09:04:22PM +0800, Eric Miao wrote:
>
>> So do you have any detailed plan in your mind? I'm basically thinking if
>> it's possible to setup a common topic branch with pxa-ssp changes to
>> be a common baseline for both trees.
>
> How about creating a branch off 2.6.34-rc1, doing the updates that need
> to be shared on that branch and then when we're happy pulling that topic
> branch into both the PXA and ASoC development trees?  If required we can
> always merge that branch multiple times into our trees.
>

Sounds good to me. Yet I doubt I won't have many changes to the SSP
from now on, as it's almost very close to what I want at the moment, so
next step work would be:

1. resolve the above conflict
2. merge the pxa168 SSP support

After that, there could be only minor changes, which could be easily
merged either way, and I'd be happy to see ASoC tree add good
support the pxa ssp. So what I'm thinking now is actually which one
is easier, to merge asoc into pxa and get ssp cleaned up or to rebase
asoc onto this ssp cleanup branch. I might need to take a look into
what's going on inside asoc to evaluate this.