diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-04-16 22:17:42 -0700 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-07 14:26:30 +0900 |
| commit | 44bfe6847a088c6207a4a21974e5cfe8517d3e4f (patch) | |
| tree | 59b910ff29d45bcbdb7ead76f69320d1f26f3f40 | |
| parent | b8568a0483a3363eda73d629536c8a019256a0bf (diff) | |
ARM: shmobile: bockw: define FPGA address and rename iomem variable
Bock-W board will needs more board specific ioremap() method.
This patch tidyup current FPGA specific settings
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.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index dac4365c515..badde08d96c 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -46,10 +46,11 @@ static const struct pinctrl_map bockw_pinctrl_map[] = { "scif0_ctrl", "scif0"), }; +#define FPGA 0x18200000 #define IRQ0MR 0x30 static void __init bockw_init(void) { - void __iomem *fpga; + void __iomem *base; r8a7778_clock_init(); r8a7778_init_irq_extpin(1); @@ -59,8 +60,8 @@ static void __init bockw_init(void) ARRAY_SIZE(bockw_pinctrl_map)); r8a7778_pinmux_init(); - fpga = ioremap_nocache(0x18200000, SZ_1M); - if (fpga) { + base = ioremap_nocache(FPGA, SZ_1M); + if (base) { /* * CAUTION * @@ -68,10 +69,10 @@ static void __init bockw_init(void) * it should be cared in the future * Now, it is assuming IRQ0 was used only from SMSC. */ - u16 val = ioread16(fpga + IRQ0MR); + u16 val = ioread16(base + IRQ0MR); val &= ~(1 << 4); /* enable SMSC911x */ - iowrite16(val, fpga + IRQ0MR); - iounmap(fpga); + iowrite16(val, base + IRQ0MR); + iounmap(base); platform_device_register_resndata( &platform_bus, "smsc911x", -1, |