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

Commit 5bb01a99 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Fix map_io for Amstrad E3 



Commit 7b88e62f (ARM: OMAP1: Use generic
map_io, init_early and init_irq) changed omap1 to use generic map_io.

Looks like I missed one board though. Fix this by adding a custom
map_io for Amstrad E3.

Reported-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 5698eb4e

arch/arm/mach-omap1/board-ams-delta.c

+7 −3
Original line number Diff line number Diff line
@@ -302,8 +302,6 @@ static void __init ams_delta_init(void) 
	omap_cfg_reg(J19_1610_CAM_D6);

	omap_cfg_reg(J18_1610_CAM_D7);



	iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc));



	omap_board_config = ams_delta_config;

	omap_board_config_size = ARRAY_SIZE(ams_delta_config);

	omap_serial_init();
@@ -373,10 +371,16 @@ static int __init ams_delta_modem_init(void) 
}

arch_initcall(ams_delta_modem_init);



static void __init ams_delta_map_io(void)

{

	omap15xx_map_io();

	iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc));

}



MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")

	/* Maintainer: Jonathan McDowell <noodles@earth.li> */

	.atag_offset	= 0x100,

	.map_io		= omap15xx_map_io,

	.map_io		= ams_delta_map_io,

	.init_early	= omap1_init_early,

	.reserve	= omap_reserve,

	.init_irq	= omap1_init_irq,