diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2013-07-18 22:34:55 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-13 23:29:16 -0700 |
| commit | ea04dd3b47aa0bb941285d2ea671fe332774e66d (patch) | |
| tree | eb08c480b1708689e0a2569388a105b3df9108e2 /arch/arm/mach-clps711x | |
| parent | f09a417a4e1abc05eea2b255aa1a5a9834e5df3c (diff) | |
| download | linux-ea04dd3b47aa0bb941285d2ea671fe332774e66d.tar.gz linux-ea04dd3b47aa0bb941285d2ea671fe332774e66d.tar.bz2 linux-ea04dd3b47aa0bb941285d2ea671fe332774e66d.zip | |
ARM: clps711x: edb7211: Remove extra iotable_init() call
The keyboard driver for the CLPS711X platform is missing, so there
is no need to call iotable_init() for this memory region.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-clps711x')
| -rw-r--r-- | arch/arm/mach-clps711x/board-edb7211.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c index 9dfb990f0801..fe6184ead896 100644 --- a/arch/arm/mach-clps711x/board-edb7211.c +++ b/arch/arm/mach-clps711x/board-edb7211.c @@ -126,21 +126,6 @@ static struct gpio edb7211_gpios[] __initconst = { { EDB7211_LCDBL, GPIOF_OUT_INIT_LOW, "LCD BACKLIGHT" }, }; -static struct map_desc edb7211_io_desc[] __initdata = { - { /* Memory-mapped extra keyboard row */ - .virtual = IO_ADDRESS(EDB7211_EXTKBD_BASE), - .pfn = __phys_to_pfn(EDB7211_EXTKBD_BASE), - .length = SZ_1M, - .type = MT_DEVICE, - }, -}; - -void __init edb7211_map_io(void) -{ - clps711x_map_io(); - iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc)); -} - /* Reserve screen memory region at the start of main system memory. */ static void __init edb7211_reserve(void) { @@ -195,7 +180,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") .nr_irqs = CLPS711X_NR_IRQS, .fixup = fixup_edb7211, .reserve = edb7211_reserve, - .map_io = edb7211_map_io, + .map_io = clps711x_map_io, .init_early = clps711x_init_early, .init_irq = clps711x_init_irq, .init_time = clps711x_timer_init, |