|
@@ -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,
|