Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e990a406 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Use SoC specifc map_io 



There's no longer any need for the board specific
map_io.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 35549ec3

arch/arm/mach-omap2/board-2430sdp.c

+1 −7
Original line number Diff line number Diff line
@@ -243,17 +243,11 @@ static void __init omap_2430sdp_init(void) 
			 "Secondary LCD backlight");

}



static void __init omap_2430sdp_map_io(void)

{

	omap2_set_globals_243x();

	omap243x_map_common_io();

}



MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")

	/* Maintainer: Syed Khasim - Texas Instruments Inc */

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_2430sdp_map_io,

	.map_io		= omap243x_map_io,

	.init_early	= omap2430_init_early,

	.init_irq	= omap2_init_irq,

	.init_machine	= omap_2430sdp_init,

arch/arm/mach-omap2/board-4430sdp.c

+1 −7
Original line number Diff line number Diff line
@@ -825,17 +825,11 @@ static void __init omap_4430sdp_init(void) 
	omap_4430sdp_display_init();

}



static void __init omap_4430sdp_map_io(void)

{

	omap2_set_globals_443x();

	omap44xx_map_common_io();

}



MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")

	/* Maintainer: Santosh Shilimkar - Texas Instruments Inc */

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_4430sdp_map_io,

	.map_io		= omap4_map_io,

	.init_early	= omap4430_init_early,

	.init_irq	= gic_init_irq,

	.init_machine	= omap_4430sdp_init,

arch/arm/mach-omap2/board-apollon.c

+1 −7
Original line number Diff line number Diff line
@@ -337,17 +337,11 @@ static void __init omap_apollon_init(void) 
	omap_sdrc_init(NULL, NULL);

}



static void __init omap_apollon_map_io(void)

{

	omap2_set_globals_242x();

	omap242x_map_common_io();

}



MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")

	/* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_apollon_map_io,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_irq	= omap2_init_irq,

	.init_machine	= omap_apollon_init,

arch/arm/mach-omap2/board-h4.c

+1 −7
Original line number Diff line number Diff line
@@ -369,17 +369,11 @@ static void __init omap_h4_init(void) 
	h4_init_flash();

}



static void __init omap_h4_map_io(void)

{

	omap2_set_globals_242x();

	omap242x_map_common_io();

}



MACHINE_START(OMAP_H4, "OMAP2420 H4 board")

	/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_h4_map_io,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_irq	= omap_h4_init_irq,

	.init_machine	= omap_h4_init,

arch/arm/mach-omap2/board-n8x0.c

+3 −9
Original line number Diff line number Diff line
@@ -616,12 +616,6 @@ static struct i2c_board_info n810_i2c_board_info_2[] __initdata = { 
	},

};



static void __init n8x0_map_io(void)

{

	omap2_set_globals_242x();

	omap242x_map_common_io();

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	/* I2S codec port pins for McBSP block */
@@ -692,7 +686,7 @@ static void __init n8x0_init_machine(void) 
MACHINE_START(NOKIA_N800, "Nokia N800")

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= n8x0_map_io,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_irq	= omap2_init_irq,

	.init_machine	= n8x0_init_machine,
@@ -702,7 +696,7 @@ MACHINE_END 
MACHINE_START(NOKIA_N810, "Nokia N810")

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= n8x0_map_io,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_irq	= omap2_init_irq,

	.init_machine	= n8x0_init_machine,
@@ -712,7 +706,7 @@ MACHINE_END 
MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= n8x0_map_io,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_irq	= omap2_init_irq,

	.init_machine	= n8x0_init_machine,