aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/io.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap1/io.c')
-rw-r--r--arch/arm/mach-omap1/io.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 7969cfda445..499b8accb83 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -15,12 +15,14 @@
#include <asm/tlb.h>
#include <asm/mach/map.h>
-#include <plat/mux.h>
-#include <plat/tc.h>
-#include "clock.h"
+#include <mach/mux.h>
+#include <mach/tc.h>
+#include <linux/omap-dma.h>
-extern void omap_check_revision(void);
+#include "iomap.h"
+#include "common.h"
+#include "clock.h"
/*
* The machine specific code may provide the extra mapping besides the
@@ -118,10 +120,9 @@ void __init omap16xx_map_io(void)
/*
* Common low-level hardware init for omap1.
*/
-void omap1_init_early(void)
+void __init omap1_init_early(void)
{
omap_check_revision();
- omap_ioremap_init();
/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
* on a Posted Write in the TIPB Bridge".
@@ -133,7 +134,11 @@ void omap1_init_early(void)
*/
omap1_clk_init();
omap1_mux_init();
- omap_init_consistent_dma_size();
+}
+
+void __init omap1_init_late(void)
+{
+ omap_serial_wakeup_init();
}
/*