diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-08-26 01:52:23 -0700 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-09-30 16:34:07 +0900 |
| commit | 71d7472f63385f4f6fb7c8548450b2e4665dc542 (patch) | |
| tree | 3df47154f139cbfedbdf704e56cb36bee04773eb /arch/arm/mach-shmobile | |
| parent | 37bf8103c51a1508d6323de19a7ae1c13c3ed3f5 (diff) | |
| download | blackbird-op-linux-71d7472f63385f4f6fb7c8548450b2e4665dc542.tar.gz blackbird-op-linux-71d7472f63385f4f6fb7c8548450b2e4665dc542.zip | |
ARM: shmobile: bockw: enable global use of FPGA
This patch enables global use of FPGA,
since it will be used from many devices.
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.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 6b9faf3908f7..b998c6b2a270 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -38,6 +38,10 @@ #include <mach/r8a7778.h> #include <asm/mach/arch.h> +#define FPGA 0x18200000 +#define IRQ0MR 0x30 +static void __iomem *fpga; + /* * CN9(Upper side) SCIF/RCAN selection * @@ -224,8 +228,6 @@ static const struct pinctrl_map bockw_pinctrl_map[] = { "vin1_data8", "vin1"), }; -#define FPGA 0x18200000 -#define IRQ0MR 0x30 #define PFC 0xfffc0000 #define PUPR4 0x110 static void __init bockw_init(void) @@ -269,8 +271,8 @@ static void __init bockw_init(void) /* for SMSC */ - base = ioremap_nocache(FPGA, SZ_1M); - if (base) { + fpga = ioremap_nocache(FPGA, SZ_1M); + if (fpga) { /* * CAUTION * @@ -278,10 +280,9 @@ 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(base + IRQ0MR); + u16 val = ioread16(fpga + IRQ0MR); val &= ~(1 << 4); /* enable SMSC911x */ - iowrite16(val, base + IRQ0MR); - iounmap(base); + iowrite16(val, fpga + IRQ0MR); regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); |
