diff mbox

[1/2,v2] ARM: shmobile: armadillo800eva: __io abuse cleanup

Message ID 87lifcb80v.wl%kuninori.morimoto.gx@renesas.com (mailing list archive)
State Superseded
Commit bc8b2428e73ce19aecbf2aac3f5d4c844adb3216
Headers show

Commit Message

Kuninori Morimoto Oct. 12, 2012, 4:59 a.m. UTC 
a2a47ca36642e3995e982957bc42678cf11ca6ac
(ARM: __io abuse cleanup) cleanuped __io() -> IOMEM(),
but armadillo800eva was a outside of a target,
since "merge window" timing issue.
This patch cleanup it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
>> Simon

I guess this patch should go to v3.7 fixup branch

 arch/arm/mach-shmobile/board-armadillo800eva.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Horman Oct. 15, 2012, 1:23 a.m. UTC | #1 
On Thu, Oct 11, 2012 at 09:59:17PM -0700, Kuninori Morimoto wrote:
> a2a47ca36642e3995e982957bc42678cf11ca6ac
> (ARM: __io abuse cleanup) cleanuped __io() -> IOMEM(),
> but armadillo800eva was a outside of a target,
> since "merge window" timing issue.
> This patch cleanup it.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> >> Simon
> 
> I guess this patch should go to v3.7 fixup branch

Thanks, applied to fixes. I'll try and get this included in 3.7.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index fe27d7e..499e6e3 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1196,7 +1196,7 @@  static void __init eva_init(void)
 
 #ifdef CONFIG_CACHE_L2X0
 	/* Early BRESP enable, Shared attribute override enable, 32K*8way */
-	l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
+	l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
 #endif
 
 	i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));