From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Arnd Bergmann <arnd@arndb.de> Cc: LKML <linux-kernel@vger.kernel.org>, Magnus Damm <magnus.damm@gmail.com>, Linux-sh list <linux-sh@vger.kernel.org>, "arm@kernel.org" <arm@kernel.org>, Paul Mundt <lethal@linux-sh.org> Subject: Re: [GIT PULL] Renesas SoC updates for v3.4, take 2 Date: Tue, 13 Mar 2012 19:36:22 +0000 [thread overview] Message-ID: <201203132036.22991.rjw@sisk.pl> (raw) In-Reply-To: <201203131026.08495.arnd@arndb.de> On Tuesday, March 13, 2012, Arnd Bergmann wrote: > On Monday 12 March 2012, Rafael J. Wysocki wrote: > > Please pull Renesas SoC updates for v3.4 since commit > > fde7d9049e55ab85a390be7f415d74c9f62dd0f9 > > > > Linux 3.3-rc7 > > > > with top-most commit 2854903ad1329d09d7ec35639fff0949e45d496d > > > > ARM: mach-shmobile: default to no earlytimer > > > > from the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc > > > > They include: > > > > * The rename of shmobile struct clk_ops to struct sh_clk_ops to avoid > > possible future name space collision with common struct clk code. > > > > This also affects drivers that are shared with the sh architecture, > > so the branch containing this part of the material, clk_ops-rename, > > will be merged into the Paul Mundt's sh tree if necessary. > > > > * Introduction of L2 Cache support for r8a7779. > > > > * Conversion of the mach-shmobile subarch to properly use a per-SoC > > map_io and separate init_early callback for early serial console > > support on platforms where that is possible. > > > > Magnus Damm is the author of all the changes. > > > > Thanks for rebasing this, Olof will merge this soon. Thanks! > Note that the __io() issue has turned out to be more urgent than I first > thought when we discussed it, so it would be good to apply the patch below > on top of your series. Do you want me to apply it now or will you do that in your tree? Rafael > 8<----- > ARM: shmobile: remove additional __io() macro use > > setup-r8a7779.c has grown a new user of the __io() macro. Rob Herring's > PIO cleanup series already gets rid of all other uses in shmobile, so > we should ensure that this one gets removed as well. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c > index ce57d90..9545d82 100644 > --- a/arch/arm/mach-shmobile/setup-r8a7779.c > +++ b/arch/arm/mach-shmobile/setup-r8a7779.c > @@ -246,7 +246,7 @@ void __init r8a7779_add_standard_devices(void) > { > #ifdef CONFIG_CACHE_L2X0 > /* Early BRESP enable, Shared attribute override enable, 64K*16way */ > - l2x0_init(__io(0xf0100000), 0x40470000, 0x82000fff); > + l2x0_init((void __iomem __force *)(0xf0100000), 0x40470000, 0x82000fff); > #endif > r8a7779_pm_init(); > > >
WARNING: multiple messages have this Message-ID (diff)
From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Arnd Bergmann <arnd@arndb.de> Cc: LKML <linux-kernel@vger.kernel.org>, Magnus Damm <magnus.damm@gmail.com>, "Linux-sh list" <linux-sh@vger.kernel.org>, "arm@kernel.org" <arm@kernel.org>, Paul Mundt <lethal@linux-sh.org> Subject: Re: [GIT PULL] Renesas SoC updates for v3.4, take 2 Date: Tue, 13 Mar 2012 20:36:22 +0100 [thread overview] Message-ID: <201203132036.22991.rjw@sisk.pl> (raw) In-Reply-To: <201203131026.08495.arnd@arndb.de> On Tuesday, March 13, 2012, Arnd Bergmann wrote: > On Monday 12 March 2012, Rafael J. Wysocki wrote: > > Please pull Renesas SoC updates for v3.4 since commit > > fde7d9049e55ab85a390be7f415d74c9f62dd0f9 > > > > Linux 3.3-rc7 > > > > with top-most commit 2854903ad1329d09d7ec35639fff0949e45d496d > > > > ARM: mach-shmobile: default to no earlytimer > > > > from the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc > > > > They include: > > > > * The rename of shmobile struct clk_ops to struct sh_clk_ops to avoid > > possible future name space collision with common struct clk code. > > > > This also affects drivers that are shared with the sh architecture, > > so the branch containing this part of the material, clk_ops-rename, > > will be merged into the Paul Mundt's sh tree if necessary. > > > > * Introduction of L2 Cache support for r8a7779. > > > > * Conversion of the mach-shmobile subarch to properly use a per-SoC > > map_io and separate init_early callback for early serial console > > support on platforms where that is possible. > > > > Magnus Damm is the author of all the changes. > > > > Thanks for rebasing this, Olof will merge this soon. Thanks! > Note that the __io() issue has turned out to be more urgent than I first > thought when we discussed it, so it would be good to apply the patch below > on top of your series. Do you want me to apply it now or will you do that in your tree? Rafael > 8<----- > ARM: shmobile: remove additional __io() macro use > > setup-r8a7779.c has grown a new user of the __io() macro. Rob Herring's > PIO cleanup series already gets rid of all other uses in shmobile, so > we should ensure that this one gets removed as well. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c > index ce57d90..9545d82 100644 > --- a/arch/arm/mach-shmobile/setup-r8a7779.c > +++ b/arch/arm/mach-shmobile/setup-r8a7779.c > @@ -246,7 +246,7 @@ void __init r8a7779_add_standard_devices(void) > { > #ifdef CONFIG_CACHE_L2X0 > /* Early BRESP enable, Shared attribute override enable, 64K*16way */ > - l2x0_init(__io(0xf0100000), 0x40470000, 0x82000fff); > + l2x0_init((void __iomem __force *)(0xf0100000), 0x40470000, 0x82000fff); > #endif > r8a7779_pm_init(); > > >
next prev parent reply other threads:[~2012-03-13 19:36 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-09 20:55 [GIT PULL] Renesas SoC updates for v3.4 Rafael J. Wysocki 2012-03-09 20:55 ` Rafael J. Wysocki 2012-03-09 21:34 ` Arnd Bergmann 2012-03-09 21:34 ` Arnd Bergmann 2012-03-09 21:48 ` Rob Herring 2012-03-09 21:48 ` Rob Herring 2012-03-09 21:52 ` Rafael J. Wysocki 2012-03-09 21:52 ` Rafael J. Wysocki 2012-03-09 22:03 ` Arnd Bergmann 2012-03-09 22:03 ` Arnd Bergmann 2012-03-09 22:27 ` Rafael J. Wysocki 2012-03-09 22:27 ` Rafael J. Wysocki 2012-03-10 10:53 ` Arnd Bergmann 2012-03-10 21:26 ` Rafael J. Wysocki 2012-03-10 21:26 ` Rafael J. Wysocki 2012-03-10 22:06 ` Geert Uytterhoeven 2012-03-10 22:06 ` Geert Uytterhoeven 2012-03-12 1:13 ` Paul Mundt 2012-03-12 1:13 ` Paul Mundt 2012-03-12 21:30 ` Rafael J. Wysocki 2012-03-12 21:30 ` Rafael J. Wysocki 2012-03-12 22:53 ` [GIT PULL] Renesas SoC updates for v3.4, take 2 Rafael J. Wysocki 2012-03-12 22:53 ` Rafael J. Wysocki 2012-03-13 10:26 ` Arnd Bergmann 2012-03-13 19:36 ` Rafael J. Wysocki [this message] 2012-03-13 19:36 ` Rafael J. Wysocki 2012-03-13 19:39 ` Arnd Bergmann 2012-03-13 20:17 ` Rafael J. Wysocki 2012-03-13 20:17 ` Rafael J. Wysocki 2012-03-13 21:42 ` Rafael J. Wysocki 2012-03-13 21:42 ` Rafael J. Wysocki 2012-03-14 0:02 ` Olof Johansson 2012-03-14 0:02 ` Olof Johansson 2012-03-14 0:16 ` Rafael J. Wysocki 2012-03-14 0:16 ` Rafael J. Wysocki 2012-03-14 0:40 ` Olof Johansson 2012-03-14 0:40 ` Olof Johansson 2012-03-14 9:03 ` Rafael J. Wysocki 2012-03-14 9:03 ` Rafael J. Wysocki
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=201203132036.22991.rjw@sisk.pl \ --to=rjw@sisk.pl \ --cc=arm@kernel.org \ --cc=arnd@arndb.de \ --cc=lethal@linux-sh.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ /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: linkBe 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.