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

Commit 869fef41 authored by Mike Rapoport's avatar Mike Rapoport Committed by Tony Lindgren
Browse files

omap3: introduce omap3_map_io 



Most OMAP3-based boards use exactly the same code for .map_io method in
the machine_desc structure.
This patch introduces omap3_map_io and updates board-* files to use it
as .map_io method.

Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c573bcf9

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

+1 −7
Original line number Diff line number Diff line
@@ -803,18 +803,12 @@ static void __init omap_3430sdp_init(void) 
	usb_ehci_init(&ehci_pdata);

}



static void __init omap_3430sdp_map_io(void)

{

	omap2_set_globals_3xxx();

	omap34xx_map_common_io();

}



MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")

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

	.phys_io	= 0x48000000,

	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,

	.boot_params	= 0x80000100,

	.map_io		= omap_3430sdp_map_io,

	.map_io		= omap3_map_io,

	.reserve	= omap_reserve,

	.init_irq	= omap_3430sdp_init_irq,

	.init_machine	= omap_3430sdp_init,

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

+1 −7
Original line number Diff line number Diff line
@@ -66,12 +66,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 
	.reset_gpio_port[2]  = -EINVAL

};



static void __init omap_sdp_map_io(void)

{

	omap2_set_globals_3xxx();

	omap34xx_map_common_io();

}



static struct omap_board_config_kernel sdp_config[] __initdata = {

};
@@ -107,7 +101,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") 
	.phys_io	= 0x48000000,

	.io_pg_offst	= ((0xfa000000) >> 18) & 0xfffc,

	.boot_params	= 0x80000100,

	.map_io		= omap_sdp_map_io,

	.map_io		= omap3_map_io,

	.reserve	= omap_reserve,

	.init_irq	= omap_sdp_init_irq,

	.init_machine	= omap_sdp_init,

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

+1 −7
Original line number Diff line number Diff line
@@ -461,17 +461,11 @@ static void __init am3517_evm_init(void) 
	am3517_evm_ethernet_init(&am3517_evm_emac_pdata);

}



static void __init am3517_evm_map_io(void)

{

	omap2_set_globals_3xxx();

	omap34xx_map_common_io();

}



MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")

	.phys_io	= 0x48000000,

	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,

	.boot_params	= 0x80000100,

	.map_io		= am3517_evm_map_io,

	.map_io		= omap3_map_io,

	.reserve	= omap_reserve,

	.init_irq	= am3517_evm_init_irq,

	.init_machine	= am3517_evm_init,

arch/arm/mach-omap2/board-cm-t35.c

+1 −7
Original line number Diff line number Diff line
@@ -708,12 +708,6 @@ static void __init cm_t35_init_irq(void) 
	omap_gpio_init();

}



static void __init cm_t35_map_io(void)

{

	omap2_set_globals_3xxx();

	omap34xx_map_common_io();

}



static struct omap_board_mux board_mux[] __initdata = {

	/* nCS and IRQ for CM-T35 ethernet */

	OMAP3_MUX(GPMC_NCS5, OMAP_MUX_MODE0),
@@ -836,7 +830,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") 
	.phys_io	= 0x48000000,

	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,

	.boot_params	= 0x80000100,

	.map_io		= cm_t35_map_io,

	.map_io		= omap3_map_io,

	.reserve	= omap_reserve,

	.init_irq	= cm_t35_init_irq,

	.init_machine	= cm_t35_init,

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

+1 −7
Original line number Diff line number Diff line
@@ -814,17 +814,11 @@ static void __init devkit8000_init(void) 
	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);

}



static void __init devkit8000_map_io(void)

{

	omap2_set_globals_3xxx();

	omap34xx_map_common_io();

}



MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")

	.phys_io	= 0x48000000,

	.io_pg_offst	= ((0xd8000000) >> 18) & 0xfffc,

	.boot_params	= 0x80000100,

	.map_io		= devkit8000_map_io,

	.map_io		= omap3_map_io,

	.reserve	= omap_reserve,

	.init_irq	= devkit8000_init_irq,

	.init_machine	= devkit8000_init,