aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-clps711x
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-07-18 14:34:55 -0400
committerOlof Johansson <olof@lixom.net>2013-08-14 02:29:16 -0400
commitea04dd3b47aa0bb941285d2ea671fe332774e66d (patch)
treeeb08c480b1708689e0a2569388a105b3df9108e2 /arch/arm/mach-clps711x
parentf09a417a4e1abc05eea2b255aa1a5a9834e5df3c (diff)
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.c17
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 = {
126 { EDB7211_LCDBL, GPIOF_OUT_INIT_LOW, "LCD BACKLIGHT" }, 126 { EDB7211_LCDBL, GPIOF_OUT_INIT_LOW, "LCD BACKLIGHT" },
127}; 127};
128 128
129static struct map_desc edb7211_io_desc[] __initdata = {
130 { /* Memory-mapped extra keyboard row */
131 .virtual = IO_ADDRESS(EDB7211_EXTKBD_BASE),
132 .pfn = __phys_to_pfn(EDB7211_EXTKBD_BASE),
133 .length = SZ_1M,
134 .type = MT_DEVICE,
135 },
136};
137
138void __init edb7211_map_io(void)
139{
140 clps711x_map_io();
141 iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc));
142}
143
144/* Reserve screen memory region at the start of main system memory. */ 129/* Reserve screen memory region at the start of main system memory. */
145static void __init edb7211_reserve(void) 130static void __init edb7211_reserve(void)
146{ 131{
@@ -195,7 +180,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
195 .nr_irqs = CLPS711X_NR_IRQS, 180 .nr_irqs = CLPS711X_NR_IRQS,
196 .fixup = fixup_edb7211, 181 .fixup = fixup_edb7211,
197 .reserve = edb7211_reserve, 182 .reserve = edb7211_reserve,
198 .map_io = edb7211_map_io, 183 .map_io = clps711x_map_io,
199 .init_early = clps711x_init_early, 184 .init_early = clps711x_init_early,
200 .init_irq = clps711x_init_irq, 185 .init_irq = clps711x_init_irq,
201 .init_time = clps711x_timer_init, 186 .init_time = clps711x_timer_init,