aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-11 02:35:06 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 03:24:21 -0500
commitb6d3eba338b4a24e49947fc45542fca7b76dda9a (patch)
tree0c0af6b67529b249b6a55ab3dbaa6a86bb01bcf3
parenta2baf1912f399c0fbb9ec8064b88a1809f5a5b0a (diff)
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>
-rw-r--r--arch/arm/mach-shmobile/board-bockw-reference.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
index 1687df9b267f..c7b217d4d1c1 100644
--- a/arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -40,7 +40,7 @@ static const struct pinctrl_map bockw_pinctrl_map[] = {
40#define COMCTLR 0x101c 40#define COMCTLR 0x101c
41static void __init bockw_init(void) 41static void __init bockw_init(void)
42{ 42{
43 static void __iomem *fpga; 43 void __iomem *fpga;
44 44
45 r8a7778_clock_init(); 45 r8a7778_clock_init();
46 r8a7778_init_irq_extpin_dt(1); 46 r8a7778_init_irq_extpin_dt(1);
@@ -62,6 +62,8 @@ static void __init bockw_init(void)
62 u16 val = ioread16(fpga + IRQ0MR); 62 u16 val = ioread16(fpga + IRQ0MR);
63 val &= ~(1 << 4); /* enable SMSC911x */ 63 val &= ~(1 << 4); /* enable SMSC911x */
64 iowrite16(val, fpga + IRQ0MR); 64 iowrite16(val, fpga + IRQ0MR);
65
66 iounmap(fpga);
65 } 67 }
66 68
67 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 69 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);