linux-next: manual merge of the sound-asoc tree with the omap tree

linux-next: manual merge of the sound-asoc tree with the omap tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 815 bytes --]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-omap2/board-n8x0.c between commits
1c37553eb1778802f0e7b6730df36542752e801e ("omap: n8x0: Cleanup i2c1 and
menelaus registration") and 69be0f6f4b8e3be992ab6a333a3a82e043784c52
("omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810")
from the omap tree and commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0
("ASoC: multi-component - ASoC Multi-Component Support") from the
sound-asoc tree.

I couldn't figure this out, so I effectively reverted the part of the
latter commit affecting that file.  Is there no way that the latter
commit can be broken up into smaller self contained pieces?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the sound-asoc tree with the omap tree

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [100817 05:14]:
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/mach-omap2/board-n8x0.c between commits
> 1c37553eb1778802f0e7b6730df36542752e801e ("omap: n8x0: Cleanup i2c1 and
> menelaus registration") and 69be0f6f4b8e3be992ab6a333a3a82e043784c52
> ("omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810")
> from the omap tree and commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0
> ("ASoC: multi-component - ASoC Multi-Component Support") from the
> sound-asoc tree.
> 
> I couldn't figure this out, so I effectively reverted the part of the
> latter commit affecting that file.  Is there no way that the latter
> commit can be broken up into smaller self contained pieces?

Let's let Jarkko and Liam to queue these along with the other
ASoC patches, I'll drop them from omap for-next.

Jarkko, can you please rebase them?

Regards,

Tony

Re: linux-next: manual merge of the sound-asoc tree with the omap tree

[Jarkko Nikula]

On Tue, 17 Aug 2010 09:15:59 +0300
Tony Lindgren <tony@atomide.com> wrote:

> * Stephen Rothwell <sfr@canb.auug.org.au> [100817 05:14]:
> > Hi all,
> > 
> > Today's linux-next merge of the sound-asoc tree got a conflict in
> > arch/arm/mach-omap2/board-n8x0.c between commits
> > 1c37553eb1778802f0e7b6730df36542752e801e ("omap: n8x0: Cleanup i2c1 and
> > menelaus registration") and 69be0f6f4b8e3be992ab6a333a3a82e043784c52
> > ("omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810")
> > from the omap tree and commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0
> > ("ASoC: multi-component - ASoC Multi-Component Support") from the
> > sound-asoc tree.
> > 
> > I couldn't figure this out, so I effectively reverted the part of the
> > latter commit affecting that file.  Is there no way that the latter
> > commit can be broken up into smaller self contained pieces?
> 
> Let's let Jarkko and Liam to queue these along with the other
> ASoC patches, I'll drop them from omap for-next.
> 
> Jarkko, can you please rebase them?
> 
I think it's easier if you keep them in l-o for-next and I send a
patch to ASoC multi-component removing board-n8x0.c changes.

That way the N810 audio is usable in linux-omap before m-c merge and m-c
patch touch less board files.


-- 
Jarkko

[PATCH] ASoC: multi-component - Drop board-n8x0.c changes

[Jarkko Nikula]

These will conflict with queued changes to board-n8x0.c coming from
linux-omap tree. Only side effect from this dropping is that the integrated
digital microphone on Nokia N810 will stop working when ASoC multi-component
is merged.

As currently the N810 is not very usable in mainline, I consider this as a
minor issue that can be fixed in linux-omap tree the after the
multi-component is merged.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
 arch/arm/mach-omap2/board-n8x0.c |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 04df912..3ccc34e 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -20,7 +20,6 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/musb.h>
-#include <sound/tlv320aic3x.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
@@ -613,25 +612,11 @@ static int n8x0_menelaus_late_init(struct device *dev)
 	return 0;
 }
 
-static struct aic3x_setup_data n810_aic33_setup = {
-	.gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
-	.gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
-};
-
-static struct aic3x_pdata n810_aic33_data = {
-	.setup = &n810_aic33_setup,
-	.gpio_reset = -1,
-};
-
 static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] = {
 	{
 		I2C_BOARD_INFO("menelaus", 0x72),
 		.irq = INT_24XX_SYS_NIRQ,
 	},
-	{
-		I2C_BOARD_INFO("tlv320aic3x", 0x1b),
-		.platform_data = &n810_aic33_data,
-	},
 };
 
 static struct menelaus_platform_data n8x0_menelaus_platform_data = {
-- 
1.7.1

Re: linux-next: manual merge of the sound-asoc tree with the omap tree

[Tony Lindgren]

* Jarkko Nikula <jhnikula@gmail.com> [100817 09:27]:
> On Tue, 17 Aug 2010 09:15:59 +0300
> Tony Lindgren <tony@atomide.com> wrote:
> 
> > * Stephen Rothwell <sfr@canb.auug.org.au> [100817 05:14]:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the sound-asoc tree got a conflict in
> > > arch/arm/mach-omap2/board-n8x0.c between commits
> > > 1c37553eb1778802f0e7b6730df36542752e801e ("omap: n8x0: Cleanup i2c1 and
> > > menelaus registration") and 69be0f6f4b8e3be992ab6a333a3a82e043784c52
> > > ("omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810")
> > > from the omap tree and commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0
> > > ("ASoC: multi-component - ASoC Multi-Component Support") from the
> > > sound-asoc tree.
> > > 
> > > I couldn't figure this out, so I effectively reverted the part of the
> > > latter commit affecting that file.  Is there no way that the latter
> > > commit can be broken up into smaller self contained pieces?
> > 
> > Let's let Jarkko and Liam to queue these along with the other
> > ASoC patches, I'll drop them from omap for-next.
> > 
> > Jarkko, can you please rebase them?
> > 
> I think it's easier if you keep them in l-o for-next and I send a
> patch to ASoC multi-component removing board-n8x0.c changes.
> 
> That way the N810 audio is usable in linux-omap before m-c merge and m-c
> patch touch less board files.

OK sounds good to me.

Thanks,

Tony

Re: [PATCH] ASoC: multi-component - Drop board-n8x0.c changes

[Mark Brown]

On Tue, Aug 17, 2010 at 09:58:02AM +0300, Jarkko Nikula wrote:
> These will conflict with queued changes to board-n8x0.c coming from
> linux-omap tree. Only side effect from this dropping is that the integrated
> digital microphone on Nokia N810 will stop working when ASoC multi-component
> is merged.
> 
> As currently the N810 is not very usable in mainline, I consider this as a
> minor issue that can be fixed in linux-omap tree the after the
> multi-component is merged.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>

Applied, thanks.  Note that m-c is now the mainline for ASoC.