omap3: Unify omap2_set_globals_3[43,6x]x functions

The only difference between them is the physical address of the
uart4 port, which is only present in 36xx chips.

We don't really need to care about keeping these 2 functions, since
the decision to use uart4 is more cleanly done later when we do have
access to omap_revision variable.

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
[tony@atomide.com: added comment for the uart4_phys]
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index dd9c03171a19c3dd0d83c69a9109fb92c18c380c..4961f3b687399040985d8d7b4496682b045c83bc 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -805,7 +805,7 @@ static void __init omap_3430sdp_init(void)
 
 static void __init omap_3430sdp_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c
index 57290fb3fcd76d5171c1316b17c944f7df78c3d4..72c2130b7f7afd16c9592487831d4f75a431f140 100644 (file)
--- a/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@ -68,7 +68,7 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 
 static void __init omap_sdp_map_io(void)
 {
-       omap2_set_globals_36xx();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 7da92defcde04e0604125da51d320f548f91c82e..43564249c62d1a8f97a12818a3ce85a51d6569cf 100644 (file)
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -463,7 +463,7 @@ static void __init am3517_evm_init(void)
 
 static void __init am3517_evm_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index bc4c3f807068ee76848370482587e6566aa2f482..6ce30b37cda295a0cd62724c9717909f15f69803 100644 (file)
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -710,7 +710,7 @@ static void __init cm_t35_init_irq(void)
 
 static void __init cm_t35_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 922b7464807fb964193b5298d2f2f99d98f6e7fd..116425877628cf448dc808b32443e5ab7df2b887 100644 (file)
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -816,7 +816,7 @@ static void __init devkit8000_init(void)
 
 static void __init devkit8000_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 759e39d1a702fdc9b84f12a70990e995154bc6d6..a8544ab3588096c0a128df9f5ced7fa8705f4b5c 100644 (file)
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -534,7 +534,7 @@ static void __init igep2_init(void)
 
 static void __init igep2_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 9cd2669113e49f548375b09260100e9da078cfd1..9bcb18248023a02eb375b25619e2acef6cd5a0bb 100644 (file)
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -408,7 +408,7 @@ static void __init omap_ldp_init(void)
 
 static void __init omap_ldp_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 0ab0c26db4dd063c99966612ca210c80ec6f3092..7b95cc1273042ca80c3c30d681043b1156c48836 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -509,7 +509,7 @@ static void __init omap3_beagle_init(void)
 
 static void __init omap3_beagle_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index a3d2e285e116111161939de0c8d2ec689cc5cb8f..65b46d4e6f18f5f502b9772b2e8f5354100a4308 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -717,7 +717,7 @@ static void __init omap3_evm_init(void)
 
 static void __init omap3_evm_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index c0f4f12eba549458fefc82124dfd3938f9976efe..49feae4bcf49b3dcde1fb16c4f4302319f9761e6 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -592,7 +592,7 @@ static void __init omap3pandora_init(void)
 
 static void __init omap3pandora_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index a04cffd691c55995812365aa78c373e7950d0b2c..497d429766924a7e8f6c228291ff0f2d357f8dbc 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -654,7 +654,7 @@ static void __init omap3_stalker_init(void)
 
 static void __init omap3_stalker_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index f05b867c585109392708a6bdb37f49392fbc775c..77a0acec28a75b36627edeb1f89c12b8356c42af 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -561,7 +561,7 @@ static void __init omap3_touchbook_init(void)
 
 static void __init omap3_touchbook_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 87acb2f198ecaedf274b18973f6ca1e99f037d96..7c6cd06cc35f68d0b5a4ae61278add40c2ee28c4 100644 (file)
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -486,7 +486,7 @@ static void __init overo_init(void)
 
 static void __init overo_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 3bd956f9e19f5bb74588dd28fcae16aa047e55de..a58e8cb1a7fc9abf639225bed3fa5de8cc3187c9 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -143,7 +143,7 @@ static void __init rx51_init(void)
 
 static void __init rx51_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        rx51_video_mem_init();
        omap34xx_map_common_io();
 }

diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
index ffe188cb18e90185f306199bae2b6da0acb71a91..3d2deb453727acae21086ef0df934f701e4e6687 100644 (file)
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@ -86,7 +86,7 @@ static void __init omap_zoom2_init(void)
 
 static void __init omap_zoom2_map_io(void)
 {
-       omap2_set_globals_343x();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c
index 5b605eba3e7bcf449c9fa62020233e49b8f8ae8a..91bc56a3e4908a8786a4fc2026b6e78429cc37e2 100644 (file)
--- a/arch/arm/mach-omap2/board-zoom3.c
+++ b/arch/arm/mach-omap2/board-zoom3.c
@@ -27,7 +27,7 @@
 
 static void __init omap_zoom_map_io(void)
 {
-       omap2_set_globals_36xx();
+       omap2_set_globals_3xxx();
        omap34xx_map_common_io();
 }
 

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index ebed82699eb2625b87898b6fcbc6f75bd44a9325..8932350abfd219bdbef82648d10f411013d25607 100644 (file)
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -317,19 +317,13 @@ static struct omap_globals omap3_globals = {
        .uart1_phys     = OMAP3_UART1_BASE,
        .uart2_phys     = OMAP3_UART2_BASE,
        .uart3_phys     = OMAP3_UART3_BASE,
+       .uart4_phys     = OMAP3_UART4_BASE,     /* Only on 3630 */
 };
 
-void __init omap2_set_globals_343x(void)
+void __init omap2_set_globals_3xxx(void)
 {
        __omap2_set_globals(&omap3_globals);
 }
-
-void __init omap2_set_globals_36xx(void)
-{
-       omap3_globals.uart4_phys = OMAP3_UART4_BASE;
-
-       __omap2_set_globals(&omap3_globals);
-}
 #endif
 
 #if defined(CONFIG_ARCH_OMAP4)

diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
index 5e4afbee0fd7812e2fe907b67fb7abaab0fb34fa..962aaebf59d4b56bf38d2a8c0acc27eb4d380caf 100644 (file)
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@ -58,8 +58,7 @@ struct omap_globals {
 
 void omap2_set_globals_242x(void);
 void omap2_set_globals_243x(void);
-void omap2_set_globals_343x(void);
-void omap2_set_globals_36xx(void);
+void omap2_set_globals_3xxx(void);
 void omap2_set_globals_443x(void);
 
 /* These get called from omap2_set_globals_xxxx(), do not call these */