Commit 9a99b142 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: merge omap1_map_io functions



The OMAP15xx/OMAP16xx variants are exactly the same, so merge them
into one.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8825acd7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static void __init ams_delta_init_late(void)

static void __init ams_delta_map_io(void)
{
	omap15xx_map_io();
	omap1_map_io();
	iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc));
}

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static void __init omap_nokia770_init(void)

MACHINE_START(NOKIA770, "Nokia 770")
	.atag_offset	= 0x100,
	.map_io		= omap16xx_map_io,
	.map_io		= omap1_map_io,
	.init_early     = omap1_init_early,
	.init_irq	= omap1_init_irq,
	.handle_irq	= omap1_handle_irq,
+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static void __init osk_init(void)
MACHINE_START(OMAP_OSK, "TI-OSK")
	/* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
	.atag_offset	= 0x100,
	.map_io		= omap16xx_map_io,
	.map_io		= omap1_map_io,
	.init_early	= omap1_init_early,
	.init_irq	= omap1_init_irq,
	.handle_irq	= omap1_handle_irq,
+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static void __init omap_palmte_init(void)

MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
	.atag_offset	= 0x100,
	.map_io		= omap15xx_map_io,
	.map_io		= omap1_map_io,
	.init_early     = omap1_init_early,
	.init_irq	= omap1_init_irq,
	.handle_irq	= omap1_handle_irq,
+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static void __init omap_sx1_init(void)

MACHINE_START(SX1, "OMAP310 based Siemens SX1")
	.atag_offset	= 0x100,
	.map_io		= omap15xx_map_io,
	.map_io		= omap1_map_io,
	.init_early     = omap1_init_early,
	.init_irq	= omap1_init_irq,
	.handle_irq	= omap1_handle_irq,
Loading