From e83045edd2e0c7a57325fd5b556fafcc316ce7f0 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Wed, 7 May 2008 16:55:13 -0700
Subject: [PATCH] --- yaml --- r: 96847 b: refs/heads/master c:
 c8d2eb8e56b93c69a30793f19ac1bc784398fbd5 h: refs/heads/master i:   96845:
 bc1c32be841f0123c6ea449011ced78d9de9d7be   96843:
 d7f3daa713b6f0d2a6aacd5f7e8d0ada95680113   96839:
 d934a68b2b1843c2cba1180e922f9a27c538e73b   96831:
 d59806cc4afb48d572b7472e3dd4ce34bb6bf4bd v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-omap2/board-2430sdp.c | 1 +
 trunk/arch/arm/mach-omap2/board-apollon.c | 1 +
 trunk/arch/arm/mach-omap2/board-generic.c | 1 +
 trunk/arch/arm/mach-omap2/board-h4.c      | 1 +
 trunk/include/asm-arm/arch-omap/common.h  | 4 ++++
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2a41894f19c6..53905b1aa5f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a4b53a22d75efa750f0b93c9b00dd0dc51c0b07
+refs/heads/master: c8d2eb8e56b93c69a30793f19ac1bc784398fbd5
diff --git a/trunk/arch/arm/mach-omap2/board-2430sdp.c b/trunk/arch/arm/mach-omap2/board-2430sdp.c
index 1c12d7c6c7fc..1682eb77c46d 100644
--- a/trunk/arch/arm/mach-omap2/board-2430sdp.c
+++ b/trunk/arch/arm/mach-omap2/board-2430sdp.c
@@ -208,6 +208,7 @@ static void __init omap_2430sdp_init(void)
 
 static void __init omap_2430sdp_map_io(void)
 {
+	omap2_set_globals_243x();
 	omap2_map_common_io();
 }
 
diff --git a/trunk/arch/arm/mach-omap2/board-apollon.c b/trunk/arch/arm/mach-omap2/board-apollon.c
index a1e1e6765b5b..620fa0f120ee 100644
--- a/trunk/arch/arm/mach-omap2/board-apollon.c
+++ b/trunk/arch/arm/mach-omap2/board-apollon.c
@@ -394,6 +394,7 @@ static void __init omap_apollon_init(void)
 
 static void __init omap_apollon_map_io(void)
 {
+	omap2_set_globals_242x();
 	omap2_map_common_io();
 }
 
diff --git a/trunk/arch/arm/mach-omap2/board-generic.c b/trunk/arch/arm/mach-omap2/board-generic.c
index 90938151bcf1..df8be081e159 100644
--- a/trunk/arch/arm/mach-omap2/board-generic.c
+++ b/trunk/arch/arm/mach-omap2/board-generic.c
@@ -65,6 +65,7 @@ static void __init omap_generic_init(void)
 
 static void __init omap_generic_map_io(void)
 {
+	omap2_set_globals_242x(); /* should be 242x, 243x, or 343x */
 	omap2_map_common_io();
 }
 
diff --git a/trunk/arch/arm/mach-omap2/board-h4.c b/trunk/arch/arm/mach-omap2/board-h4.c
index d1915f99a5fa..0d28f6897c8e 100644
--- a/trunk/arch/arm/mach-omap2/board-h4.c
+++ b/trunk/arch/arm/mach-omap2/board-h4.c
@@ -420,6 +420,7 @@ static void __init omap_h4_init(void)
 
 static void __init omap_h4_map_io(void)
 {
+	omap2_set_globals_242x();
 	omap2_map_common_io();
 }
 
diff --git a/trunk/include/asm-arm/arch-omap/common.h b/trunk/include/asm-arm/arch-omap/common.h
index 224e009e5296..36a3b62d4d8d 100644
--- a/trunk/include/asm-arm/arch-omap/common.h
+++ b/trunk/include/asm-arm/arch-omap/common.h
@@ -47,4 +47,8 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
 }
 #endif
 
+void omap2_set_globals_242x(void);
+void omap2_set_globals_243x(void);
+void omap2_set_globals_343x(void);
+
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */