From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 2/6] omap cleanup for v3.6 merge window
Date: Sun, 1 Jul 2012 02:39:49 -0700 [thread overview]
Message-ID: <20120701093949.GM4202@atomide.com> (raw)
In-Reply-To: <E1SlGGy-0003tf-Lc@merlin.infradead.org>
* Tony Lindgren <tony@atomide.com> [120701 02:28]:
> The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
>
> Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-for-v3.6
>
> for you to fetch changes up to 472fd5401561f94698f4c8f9dbbbfbf76ab55626:
>
> Merge branch 'cleanup-hwmod' into cleanup (2012-06-28 05:47:01 -0700)
>
> ----------------------------------------------------------------
>
> Here is some more omap clean-up. The biggest changes are
> hwmod, clock, and System Control Module cleanup, and the removal
> of the last instance of omap_read/write usage for omap2+ with
> the removal of unused USB OHCI Full Speed driver support. The
> removed OHCI is only currently used for omap1 as the actively
> used omap2+ boards have either MUSB or another instance of
> OHCI+EHCI that's more usable.
>
> ----------------------------------------------------------------
This one has a merge conflict with the non-critical fixes in 1/6
of this series that can be resolved as below.
Tony
--- a/arch/arm/mach-omap2/clockdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/clockdomains3xxx_data.c
@@@ -452,15 -345,20 +452,14 @@@ static struct clkdm_autodep clkdm_am35x
*
*/
-static struct clockdomain *clockdomains_omap3430_common[] __initdata = {
+static struct clockdomain *clockdomains_common[] __initdata = {
&wkup_common_clkdm,
- &cm_common_clkdm,
- &prm_common_clkdm,
+ &mpu_3xxx_clkdm,
&neon_clkdm,
- &iva2_clkdm,
- &d2d_clkdm,
&core_l3_3xxx_clkdm,
&core_l4_3xxx_clkdm,
- &dss_3xxx_clkdm,
- &cam_clkdm,
- &per_clkdm,
&emu_clkdm,
&dpll1_clkdm,
- &dpll2_clkdm,
&dpll3_clkdm,
&dpll4_clkdm,
NULL
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/6] omap cleanup for v3.6 merge window
Date: Sun, 1 Jul 2012 02:39:49 -0700 [thread overview]
Message-ID: <20120701093949.GM4202@atomide.com> (raw)
In-Reply-To: <E1SlGGy-0003tf-Lc@merlin.infradead.org>
* Tony Lindgren <tony@atomide.com> [120701 02:28]:
> The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
>
> Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-for-v3.6
>
> for you to fetch changes up to 472fd5401561f94698f4c8f9dbbbfbf76ab55626:
>
> Merge branch 'cleanup-hwmod' into cleanup (2012-06-28 05:47:01 -0700)
>
> ----------------------------------------------------------------
>
> Here is some more omap clean-up. The biggest changes are
> hwmod, clock, and System Control Module cleanup, and the removal
> of the last instance of omap_read/write usage for omap2+ with
> the removal of unused USB OHCI Full Speed driver support. The
> removed OHCI is only currently used for omap1 as the actively
> used omap2+ boards have either MUSB or another instance of
> OHCI+EHCI that's more usable.
>
> ----------------------------------------------------------------
This one has a merge conflict with the non-critical fixes in 1/6
of this series that can be resolved as below.
Tony
--- a/arch/arm/mach-omap2/clockdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/clockdomains3xxx_data.c
@@@ -452,15 -345,20 +452,14 @@@ static struct clkdm_autodep clkdm_am35x
*
*/
-static struct clockdomain *clockdomains_omap3430_common[] __initdata = {
+static struct clockdomain *clockdomains_common[] __initdata = {
&wkup_common_clkdm,
- &cm_common_clkdm,
- &prm_common_clkdm,
+ &mpu_3xxx_clkdm,
&neon_clkdm,
- &iva2_clkdm,
- &d2d_clkdm,
&core_l3_3xxx_clkdm,
&core_l4_3xxx_clkdm,
- &dss_3xxx_clkdm,
- &cam_clkdm,
- &per_clkdm,
&emu_clkdm,
&dpll1_clkdm,
- &dpll2_clkdm,
&dpll3_clkdm,
&dpll4_clkdm,
NULL
next prev parent reply other threads:[~2012-07-01 9:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-01 9:01 [GIT PULL 1/6] omap non-critical fixes for v3.6 merge window Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 3/6] omap dmtimer changes " Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 2/6] omap cleanup " Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 4/6] omap HDQ1W and smartreflex driver changes " Tony Lindgren
2012-07-01 9:01 ` Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 3/6] omap dmtimer " Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 2/6] omap cleanup " Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 5/6] omap PM changes for PRCM I/O chain wakeup and cpuidle " Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 6/6] am33xx changes " Tony Lindgren
2012-07-01 9:01 ` Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 5/6] omap PM changes for PRCM I/O chain wakeup and cpuidle " Tony Lindgren
[not found] ` <E1SlGGy-0003tf-Lc@merlin.infradead.org>
2012-07-01 9:39 ` Tony Lindgren [this message]
2012-07-01 9:39 ` [GIT PULL 2/6] omap cleanup " Tony Lindgren
2012-07-03 20:23 ` [GIT PULL 1/6] omap non-critical fixes " Arnd Bergmann
2012-07-03 20:23 ` Arnd Bergmann
2012-07-04 6:21 ` Tony Lindgren
2012-07-04 6:21 ` Tony Lindgren
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=20120701093949.GM4202@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.