From e9dafa5e53fdefdbcdc1f2f8c68142d9236885e9 Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti.com>
Date: Fri, 23 Sep 2011 22:23:09 +0200
Subject: [PATCH] --- yaml --- r: 272607 b: refs/heads/master c:
 35549ec3c3e67188a8d3eac0167e950c46688c96 h: refs/heads/master i:   272605:
 72efafbaae0479cdb926d690b943f7a285b9ce9d   272603:
 9df016d17a5472916e89762baed896a5f99b1eeb   272599:
 9d6907aa252f1cefd07af2a3c4e06cc893f46a96   272591:
 ec76b46ff0ba8d04b961621dfb8f5f735fe666b3   272575:
 a218cd3b202a84045eacc6a5d4590222b8cda440 v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/arm/mach-omap2/common.c             | 18 ++++++++++++++++++
 trunk/arch/arm/plat-omap/include/plat/common.h |  4 ++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2e7d423190f5..450b83c7d821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bc0c4bac72375517d904e02c46da2a23e079e8b
+refs/heads/master: 35549ec3c3e67188a8d3eac0167e950c46688c96
diff --git a/trunk/arch/arm/mach-omap2/common.c b/trunk/arch/arm/mach-omap2/common.c
index 3f20cbb9967b..de61f15c48e2 100644
--- a/trunk/arch/arm/mach-omap2/common.c
+++ b/trunk/arch/arm/mach-omap2/common.c
@@ -56,6 +56,12 @@ void __init omap2_set_globals_242x(void)
 {
 	__omap2_set_globals(&omap242x_globals);
 }
+
+void __init omap242x_map_io(void)
+{
+	omap2_set_globals_242x();
+	omap242x_map_common_io();
+}
 #endif
 
 #if defined(CONFIG_SOC_OMAP2430)
@@ -74,6 +80,12 @@ void __init omap2_set_globals_243x(void)
 {
 	__omap2_set_globals(&omap243x_globals);
 }
+
+void __init omap243x_map_io(void)
+{
+	omap2_set_globals_243x();
+	omap243x_map_common_io();
+}
 #endif
 
 #if defined(CONFIG_ARCH_OMAP3)
@@ -138,5 +150,11 @@ void __init omap2_set_globals_443x(void)
 	omap2_set_globals_control(&omap4_globals);
 	omap2_set_globals_prcm(&omap4_globals);
 }
+
+void __init omap4_map_io(void)
+{
+	omap2_set_globals_443x();
+	omap44xx_map_common_io();
+}
 #endif
 
diff --git a/trunk/arch/arm/plat-omap/include/plat/common.h b/trunk/arch/arm/plat-omap/include/plat/common.h
index 5cac97e36079..abda2c7e499b 100644
--- a/trunk/arch/arm/plat-omap/include/plat/common.h
+++ b/trunk/arch/arm/plat-omap/include/plat/common.h
@@ -83,7 +83,11 @@ void omap2_set_globals_sdrc(struct omap_globals *);
 void omap2_set_globals_control(struct omap_globals *);
 void omap2_set_globals_prcm(struct omap_globals *);
 
+void omap242x_map_io(void);
+void omap243x_map_io(void);
 void omap3_map_io(void);
+void omap4_map_io(void);
+
 
 /**
  * omap_test_timeout - busy-loop, testing a condition