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

[Haojian Zhuang]

On Wed, Mar 17, 2010 at 5:05 AM, Mark Brown
<broonie at opensource.wolfsonmicro.com> wrote:
> On Wed, Mar 17, 2010 at 01:14:39PM +0800, Eric Miao wrote:
>
>> I'm seeing no merge conflict between my ssp_cleanup and Takashi's
>> latest tree, which branch do you suggest to merge then?
>
> I'm not sure what you're asking here but if you're looking for any
> incompatible changes in ASoC they've not been implemented yet, the issue
> is that due to the stuff Liam is working on at the minute there are
> likely to be incompatible changes in the current release cycle which
> would mean that merging new drivers (like Haojian posted) via a non-ALSA
> tree would lead to problems after the trees are been merged together.
>

Hi Mark & Eric,

There're some ssp fixes after 2.6.34-rc1 that result ssp code
different between pxa tree and asoc tree (neither Eric's ssp cleanup
patch nor my patch). If those fixes  could be merged into 2.6.34-rc2,
I want to know whether ASoC tree will sync to them. If so, it seems
that we could work at the same point. What's your opinion, Mark?

By the way, I reformat my patches on Eric's git since one of my patch
is contained in his branch. Now I attach them for review first.

Thanks
Haojian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ASoC-split-pxa-ssp-for-reusing-code.patch
Type: text/x-patch
Size: 43910 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0005.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002--ARM-pxa-remove-ifdef-in-ssp.h.patch
Type: text/x-patch
Size: 4501 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0006.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003--ARM-mmp-support-ssp-in-pxa168.patch
Type: text/x-patch
Size: 8934 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0007.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-ASoC-support-codec-via-ssp-interface-in-aspenite.patch
Type: text/x-patch
Size: 20797 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0008.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005--ARM-mmp-enable-ssp-in-aspenite.patch
Type: text/x-patch
Size: 1444 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0009.bin>