Commit 44bfe684 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Simon Horman

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent b8568a04
...@@ -46,10 +46,11 @@ static const struct pinctrl_map bockw_pinctrl_map[] = { ...@@ -46,10 +46,11 @@ static const struct pinctrl_map bockw_pinctrl_map[] = {
"scif0_ctrl", "scif0"), "scif0_ctrl", "scif0"),
}; };
#define FPGA 0x18200000
#define IRQ0MR 0x30 #define IRQ0MR 0x30
static void __init bockw_init(void) static void __init bockw_init(void)
{ {
void __iomem *fpga; void __iomem *base;
r8a7778_clock_init(); r8a7778_clock_init();
r8a7778_init_irq_extpin(1); r8a7778_init_irq_extpin(1);
...@@ -59,8 +60,8 @@ static void __init bockw_init(void) ...@@ -59,8 +60,8 @@ static void __init bockw_init(void)
ARRAY_SIZE(bockw_pinctrl_map)); ARRAY_SIZE(bockw_pinctrl_map));
r8a7778_pinmux_init(); r8a7778_pinmux_init();
fpga = ioremap_nocache(0x18200000, SZ_1M); base = ioremap_nocache(FPGA, SZ_1M);
if (fpga) { if (base) {
/* /*
* CAUTION * CAUTION
* *
...@@ -68,10 +69,10 @@ static void __init bockw_init(void) ...@@ -68,10 +69,10 @@ static void __init bockw_init(void)
* it should be cared in the future * it should be cared in the future
* Now, it is assuming IRQ0 was used only from SMSC. * 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 */ val &= ~(1 << 4); /* enable SMSC911x */
iowrite16(val, fpga + IRQ0MR); iowrite16(val, base + IRQ0MR);
iounmap(fpga); iounmap(base);
platform_device_register_resndata( platform_device_register_resndata(
&platform_bus, "smsc911x", -1, &platform_bus, "smsc911x", -1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment