Commit c573bcf9 authored by Sergio Aguirre's avatar Sergio Aguirre Committed by Tony Lindgren
Browse files

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: default avatarSergio Aguirre <saaguirre@ti.com>
Acked-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
[tony@atomide.com: added comment for the uart4_phys]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent be82ae02
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -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();
}
......
......@@ -27,7 +27,7 @@
static void __init omap_zoom_map_io(void)
{
omap2_set_globals_36xx();
omap2_set_globals_3xxx();
omap34xx_map_common_io();
}
......
......@@ -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)
......
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment