summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-10 23:35:06 -0700
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 17:24:21 +0900
commitb6d3eba338b4a24e49947fc45542fca7b76dda9a (patch)
tree0c0af6b67529b249b6a55ab3dbaa6a86bb01bcf3 /arch/arm/mach-shmobile
parenta2baf1912f399c0fbb9ec8064b88a1809f5a5b0a (diff)
downloadop-kernel-dev-b6d3eba338b4a24e49947fc45542fca7b76dda9a.zip
op-kernel-dev-b6d3eba338b4a24e49947fc45542fca7b76dda9a.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
-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 1687df9..c7b217d 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[] = {
#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);
@@ -62,6 +62,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);
OpenPOWER on IntegriCloud