* linux-next: manual merge of the sound-asoc tree with the omap tree
@ 2010-08-17 2:21 Stephen Rothwell
2010-08-17 6:15 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-08-17 2:21 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Jarkko Nikula, Tony Lindgren, linux-omap
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the omap tree
2010-08-17 2:21 linux-next: manual merge of the sound-asoc tree with the omap tree Stephen Rothwell
@ 2010-08-17 6:15 ` Tony Lindgren
2010-08-17 6:34 ` Jarkko Nikula
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2010-08-17 6:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel,
Jarkko Nikula, linux-omap
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the omap tree
2010-08-17 6:15 ` Tony Lindgren
@ 2010-08-17 6:34 ` Jarkko Nikula
2010-08-17 6:58 ` [PATCH] ASoC: multi-component - Drop board-n8x0.c changes Jarkko Nikula
2010-08-17 7:53 ` linux-next: manual merge of the sound-asoc tree with the omap tree Tony Lindgren
0 siblings, 2 replies; 6+ messages in thread
From: Jarkko Nikula @ 2010-08-17 6:34 UTC (permalink / raw)
To: Tony Lindgren
Cc: Stephen Rothwell, Mark Brown, Liam Girdwood, linux-next,
linux-kernel, linux-omap
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ASoC: multi-component - Drop board-n8x0.c changes
2010-08-17 6:34 ` Jarkko Nikula
@ 2010-08-17 6:58 ` Jarkko Nikula
2010-08-17 10:12 ` Mark Brown
2010-08-17 7:53 ` linux-next: manual merge of the sound-asoc tree with the omap tree Tony Lindgren
1 sibling, 1 reply; 6+ messages in thread
From: Jarkko Nikula @ 2010-08-17 6:58 UTC (permalink / raw)
To: alsa-devel
Cc: linux-next, Liam Girdwood, Mark Brown, Stephen Rothwell,
Tony Lindgren, 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the omap tree
2010-08-17 6:34 ` Jarkko Nikula
2010-08-17 6:58 ` [PATCH] ASoC: multi-component - Drop board-n8x0.c changes Jarkko Nikula
@ 2010-08-17 7:53 ` Tony Lindgren
1 sibling, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2010-08-17 7:53 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Stephen Rothwell, Mark Brown, Liam Girdwood, linux-next,
linux-kernel, linux-omap
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: multi-component - Drop board-n8x0.c changes
2010-08-17 6:58 ` [PATCH] ASoC: multi-component - Drop board-n8x0.c changes Jarkko Nikula
@ 2010-08-17 10:12 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2010-08-17 10:12 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Tony Lindgren, Stephen Rothwell, alsa-devel, linux-next, Liam Girdwood
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-08-17 10:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-17 2:21 linux-next: manual merge of the sound-asoc tree with the omap tree Stephen Rothwell
2010-08-17 6:15 ` Tony Lindgren
2010-08-17 6:34 ` Jarkko Nikula
2010-08-17 6:58 ` [PATCH] ASoC: multi-component - Drop board-n8x0.c changes Jarkko Nikula
2010-08-17 10:12 ` Mark Brown
2010-08-17 7:53 ` linux-next: manual merge of the sound-asoc tree with the omap tree Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).