| From 50ab4de29113c7408a3bdba535affe2a00d3b074 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 10 Oct 2013 23:35:06 -0700 |
| Subject: ARM: shmobile: bockw: fixup FPGA ioremap area |
| |
| Don't keep FPGA ioremap area. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit b6d3eba338b4a24e49947fc45542fca7b76dda9a) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bockw-reference.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c |
| index 875cf3f3f503..fac95a4d6553 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw-reference.c |
| +++ b/arch/arm/mach-shmobile/board-bockw-reference.c |
| @@ -32,7 +32,7 @@ |
| #define COMCTLR 0x101c |
| static void __init bockw_init(void) |
| { |
| - static void __iomem *fpga; |
| + void __iomem *fpga; |
| |
| r8a7778_clock_init(); |
| r8a7778_init_irq_extpin_dt(1); |
| @@ -50,6 +50,8 @@ static void __init bockw_init(void) |
| u16 val = ioread16(fpga + IRQ0MR); |
| val &= ~(1 << 4); /* enable SMSC911x */ |
| iowrite16(val, fpga + IRQ0MR); |
| + |
| + iounmap(fpga); |
| } |
| |
| of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
| -- |
| 1.8.5.rc3 |
| |
