[alsa-devel] [PATCH 01/14] ASoC: multi-component - TI OMAP Platform

[Liam Girdwood]

On Wed, 2010-08-11 at 14:04 +0300, Jarkko Nikula wrote:
> Hi
> 
> On Wed, 11 Aug 2010 09:46:20 +0100
> Liam Girdwood <lrg at slimlogic.co.uk> wrote:
> 
> > Other notable changes required for multi-component support:-
> > 
> >  o Moved zoom2 audio platform data to board-zoom2.c
> >  o Moved n810 audio platform data to board-n810.c
> >  o Moved RX51 audio platform data to board-rx51-peripherals.c
> >  o Added ASoC DAI and DMA platform devices.
> 
> Here are rejects from these two files when applied to Vanilla:
> 
> arch/arm/mach-omap2/board-rx51-peripherals.c
> arch/arm/mach-omap2/board-zoom2.c
> 
> Fortunately trivial.
> 
> board-rx51-peripherals.c conflicts with rx51_aic3x_data (i.e. add only
> rx51_aic34_setup) and board-zoom2.c with board_nand_init in
> omap_zoom2_init.
> 
> board-n8x0.c will conflict in 2.6.37 with changes from linux-omap but
> this is easiest to handle if you leave out the
> arch/arm/mach-omap2/board-n8x0.c changes. IMO n810_aic33_setup for
> the digital microphone can be patched after m-c.
> 

Thanks, I was expecting some conflicts in arch. Hopefully, these will
lessen when the 2.6.37 merge starts and I can rebase to a more recent
kernel before m-c is merged.

> >  o Misc fixes from Jarkko Nikula
> > 
> Add Peter also as he sent fixes too :-)

Oops.

Thanks

Liam
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk