lkml.org 
[lkml]   [2012]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [GIT PULL] Renesas SoC updates for v3.4, take 2
Date
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();
>
>
>



\
 
 \ /
  Last update: 2012-03-13 20:35    [W:0.065 / U:37.320 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site