From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the i.MX tree
Date: Thu, 30 Sep 2010 08:52:02 +0200 [thread overview]
Message-ID: <20100930065202.GK29811@pengutronix.de> (raw)
In-Reply-To: <20100930064140.GI29811@pengutronix.de>
Hello,
On Thu, Sep 30, 2010 at 08:41:40AM +0200, Uwe Kleine-König wrote:
> On Thu, Sep 30, 2010 at 11:23:02AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the sound-asoc tree got a conflict in
> > arch/arm/mach-mx3/devices.c between commit
> > 4697bb926f43b8012ebd111ef43834f42126a0ef ("ARM: imx: dynamically allocate
> > imx-ssi devices") from the i.MX tree and commit
> > f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ("ASoC: multi-component - ASoC
> > Multi-Component Support") from the sound-asoc tree.
> >
> > The former removed that code that the latter changed. I just used the
> > former.
> >
> > The latter was just changing some names, so ti may be able to be
> > integrated into the former.
> I think the same problem exists for mx2. Maybe git didn't notice as
> arch/arm/mach-mx2/devices.c was moved to arch/arm/mach-imx/devices.c
> (and merged with arch/arm/mach-mx1/devices.c)?!
>
> I didn't test, but I guess we need the following patch squashed into the
> merge:
>
> diff --git a/arch/arm/plat-mxc/devices/platform-imx-ssi.c b/arch/arm/plat-mxc/devices/platform-imx-ssi.c
> index 38a7a0b..6d74a25 100644
> --- a/arch/arm/plat-mxc/devices/platform-imx-ssi.c
> +++ b/arch/arm/plat-mxc/devices/platform-imx-ssi.c
> @@ -101,7 +101,7 @@ struct platform_device *__init imx_add_imx_ssi(
> DMARES(rx1),
> };
>
> - return imx_add_platform_device("imx-ssi", data->id,
> + return imx_add_platform_device("imx-ssi-dai", data->id,
> res, ARRAY_SIZE(res),
> pdata, sizeof(*pdata));
> }
I just noticed there are some more problems:
ukl@octopus:~/gsrc/linux-2.6$ git grep \"imx-ssi[^-] next/master -- arch/arm/mach-{imx,mx*}
next/master:arch/arm/mach-imx/clock-imx27.c: _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
next/master:arch/arm/mach-imx/clock-imx27.c: _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
next/master:arch/arm/mach-mx25/clock.c: _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
next/master:arch/arm/mach-mx25/clock.c: _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
next/master:arch/arm/mach-mx5/clock-mx51.c: _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
next/master:arch/arm/mach-mx5/clock-mx51.c: _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
The change to clock-imx27.c got lost similar to mx2/devices.c. When
f0fba2ad1b6b53d5360125c41953b7afcd6deff0 was commited
arch/arm/mach-mx5/clock-mx51.c and arch/arm/mach-mx25/clock.c didn't
contain the clock for imx-ssi, yet.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
prev parent reply other threads:[~2010-09-30 6:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 1:23 linux-next: manual merge of the sound-asoc tree with the i.MX tree Stephen Rothwell
2010-09-30 3:31 ` Mark Brown
2010-09-30 6:45 ` Uwe Kleine-König
2010-09-30 6:58 ` Mark Brown
2010-09-30 7:44 ` Uwe Kleine-König
2010-09-30 6:41 ` Uwe Kleine-König
2010-09-30 6:52 ` Uwe Kleine-König [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100930065202.GK29811@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=s.hauer@pengutronix.de \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).