* [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions @ 2010-06-29 20:30 Sergio Aguirre 2010-06-29 22:24 ` Kevin Hilman 2010-06-30 5:25 ` Mike Rapoport 0 siblings, 2 replies; 8+ messages in thread From: Sergio Aguirre @ 2010-06-29 20:30 UTC (permalink / raw) To: linux-omap; +Cc: Tony Lindgren, Sergio Aguirre 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> --- arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-3630sdp.c | 2 +- arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 2 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/board-omap3stalker.c | 2 +- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/board-overo.c | 2 +- arch/arm/mach-omap2/board-rx51.c | 2 +- arch/arm/mach-omap2/board-zoom2.c | 2 +- arch/arm/mach-omap2/board-zoom3.c | 2 +- arch/arm/plat-omap/common.c | 10 ++-------- arch/arm/plat-omap/include/plat/common.h | 3 +-- 18 files changed, 19 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index dd9c031..4961f3b 100644 --- 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 57290fb..72c2130 100644 --- 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 7da92de..4356424 100644 --- 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 bc4c3f8..6ce30b3 100644 --- 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 922b746..1164258 100644 --- 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 759e39d..a8544ab 100644 --- 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 9cd2669..9bcb182 100644 --- 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 0ab0c26..7b95cc1 100644 --- 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 a3d2e28..65b46d4 100644 --- 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 c0f4f12..49feae4 100644 --- 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 a04cffd..497d429 100644 --- 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 f05b867..77a0ace 100644 --- 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 d05ced5..d62fc19 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -524,7 +524,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 3bd956f..a58e8cb 100644 --- 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 ffe188c..3d2deb4 100644 --- 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 5b605eb..91bc56a 100644 --- 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 fca73cd..4631766 100644 --- 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, }; -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 5e4afbe..962aaeb 100644 --- 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 */ -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions 2010-06-29 20:30 [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions Sergio Aguirre @ 2010-06-29 22:24 ` Kevin Hilman 2010-07-07 10:34 ` Tony Lindgren 2010-06-30 5:25 ` Mike Rapoport 1 sibling, 1 reply; 8+ messages in thread From: Kevin Hilman @ 2010-06-29 22:24 UTC (permalink / raw) To: Sergio Aguirre; +Cc: linux-omap, Tony Lindgren Sergio Aguirre <saaguirre@ti.com> writes: > 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. Also, with the converion of UART to hwmod, there is no longer any need for UART base addresses in the globals struct (they've been removed in the work-in-progress conversion of UART. > Signed-off-by: Sergio Aguirre <saaguirre@ti.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions 2010-06-29 22:24 ` Kevin Hilman @ 2010-07-07 10:34 ` Tony Lindgren 0 siblings, 0 replies; 8+ messages in thread From: Tony Lindgren @ 2010-07-07 10:34 UTC (permalink / raw) To: Kevin Hilman; +Cc: Sergio Aguirre, linux-omap * Kevin Hilman <khilman@deeprootsystems.com> [100630 01:18]: > Sergio Aguirre <saaguirre@ti.com> writes: > > > 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. > > Also, with the converion of UART to hwmod, there is no longer any need > for UART base addresses in the globals struct (they've been removed in > the work-in-progress conversion of UART. > > > Signed-off-by: Sergio Aguirre <saaguirre@ti.com> > > Acked-by: Kevin Hilman <khilman@deeprootsystems.com> > I've applied this and added a comment for the uart4 only being on omap3630. Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions 2010-06-29 20:30 [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions Sergio Aguirre 2010-06-29 22:24 ` Kevin Hilman @ 2010-06-30 5:25 ` Mike Rapoport 2010-06-30 6:36 ` Tony Lindgren 1 sibling, 1 reply; 8+ messages in thread From: Mike Rapoport @ 2010-06-30 5:25 UTC (permalink / raw) To: Sergio Aguirre; +Cc: linux-omap, Tony Lindgren, Kevin Hilman, Mike Rapoport Sergio Aguirre wrote: > 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> > --- > arch/arm/mach-omap2/board-3430sdp.c | 2 +- > arch/arm/mach-omap2/board-3630sdp.c | 2 +- > arch/arm/mach-omap2/board-am3517evm.c | 2 +- > arch/arm/mach-omap2/board-cm-t35.c | 2 +- > arch/arm/mach-omap2/board-devkit8000.c | 2 +- > arch/arm/mach-omap2/board-igep0020.c | 2 +- > arch/arm/mach-omap2/board-ldp.c | 2 +- > arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > arch/arm/mach-omap2/board-omap3evm.c | 2 +- > arch/arm/mach-omap2/board-omap3pandora.c | 2 +- > arch/arm/mach-omap2/board-omap3stalker.c | 2 +- > arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- > arch/arm/mach-omap2/board-overo.c | 2 +- > arch/arm/mach-omap2/board-rx51.c | 2 +- > arch/arm/mach-omap2/board-zoom2.c | 2 +- > arch/arm/mach-omap2/board-zoom3.c | 2 +- > arch/arm/plat-omap/common.c | 10 ++-------- > arch/arm/plat-omap/include/plat/common.h | 3 +-- > 18 files changed, 19 insertions(+), 26 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c > index dd9c031..4961f3b 100644 > --- 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(); > } Maybe we should take it one step further and replace board_map_io functions with common omap3_map_io? > diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c > index 57290fb..72c2130 100644 > --- 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 7da92de..4356424 100644 > --- 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 bc4c3f8..6ce30b3 100644 > --- 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 922b746..1164258 100644 > --- 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 759e39d..a8544ab 100644 > --- 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 9cd2669..9bcb182 100644 > --- 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 0ab0c26..7b95cc1 100644 > --- 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 a3d2e28..65b46d4 100644 > --- 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 c0f4f12..49feae4 100644 > --- 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 a04cffd..497d429 100644 > --- 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 f05b867..77a0ace 100644 > --- 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 d05ced5..d62fc19 100644 > --- a/arch/arm/mach-omap2/board-overo.c > +++ b/arch/arm/mach-omap2/board-overo.c > @@ -524,7 +524,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 3bd956f..a58e8cb 100644 > --- 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 ffe188c..3d2deb4 100644 > --- 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 5b605eb..91bc56a 100644 > --- 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 fca73cd..4631766 100644 > --- 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, > }; > > -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 5e4afbe..962aaeb 100644 > --- 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 */ -- Sincerely yours, Mike. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions 2010-06-30 5:25 ` Mike Rapoport @ 2010-06-30 6:36 ` Tony Lindgren 2010-06-30 7:04 ` Mike Rapoport 2010-06-30 8:47 ` [PATCH] omap3: introduce omap3_map_io Mike Rapoport 0 siblings, 2 replies; 8+ messages in thread From: Tony Lindgren @ 2010-06-30 6:36 UTC (permalink / raw) To: Mike Rapoport; +Cc: Sergio Aguirre, linux-omap, Kevin Hilman * Mike Rapoport <mike@compulab.co.il> [100630 08:20]: > Sergio Aguirre wrote: > >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> > >--- > > arch/arm/mach-omap2/board-3430sdp.c | 2 +- > > arch/arm/mach-omap2/board-3630sdp.c | 2 +- > > arch/arm/mach-omap2/board-am3517evm.c | 2 +- > > arch/arm/mach-omap2/board-cm-t35.c | 2 +- > > arch/arm/mach-omap2/board-devkit8000.c | 2 +- > > arch/arm/mach-omap2/board-igep0020.c | 2 +- > > arch/arm/mach-omap2/board-ldp.c | 2 +- > > arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > > arch/arm/mach-omap2/board-omap3evm.c | 2 +- > > arch/arm/mach-omap2/board-omap3pandora.c | 2 +- > > arch/arm/mach-omap2/board-omap3stalker.c | 2 +- > > arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- > > arch/arm/mach-omap2/board-overo.c | 2 +- > > arch/arm/mach-omap2/board-rx51.c | 2 +- > > arch/arm/mach-omap2/board-zoom2.c | 2 +- > > arch/arm/mach-omap2/board-zoom3.c | 2 +- > > arch/arm/plat-omap/common.c | 10 ++-------- > > arch/arm/plat-omap/include/plat/common.h | 3 +-- > > 18 files changed, 19 insertions(+), 26 deletions(-) > > > >diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c > >index dd9c031..4961f3b 100644 > >--- 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(); > > } > > Maybe we should take it one step further and replace board_map_io > functions with common omap3_map_io? Could be done yeah. If special handling is needed, it can still be done in the board-*.c files. Care to do a patch for that? Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions 2010-06-30 6:36 ` Tony Lindgren @ 2010-06-30 7:04 ` Mike Rapoport 2010-06-30 8:47 ` [PATCH] omap3: introduce omap3_map_io Mike Rapoport 1 sibling, 0 replies; 8+ messages in thread From: Mike Rapoport @ 2010-06-30 7:04 UTC (permalink / raw) To: Tony Lindgren; +Cc: Sergio Aguirre, linux-omap, Kevin Hilman, Mike Rapoport Tony Lindgren wrote: > * Mike Rapoport <mike@compulab.co.il> [100630 08:20]: >> Sergio Aguirre wrote: >>> 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> >>> --- >>> arch/arm/mach-omap2/board-3430sdp.c | 2 +- >>> arch/arm/mach-omap2/board-3630sdp.c | 2 +- >>> arch/arm/mach-omap2/board-am3517evm.c | 2 +- >>> arch/arm/mach-omap2/board-cm-t35.c | 2 +- >>> arch/arm/mach-omap2/board-devkit8000.c | 2 +- >>> arch/arm/mach-omap2/board-igep0020.c | 2 +- >>> arch/arm/mach-omap2/board-ldp.c | 2 +- >>> arch/arm/mach-omap2/board-omap3beagle.c | 2 +- >>> arch/arm/mach-omap2/board-omap3evm.c | 2 +- >>> arch/arm/mach-omap2/board-omap3pandora.c | 2 +- >>> arch/arm/mach-omap2/board-omap3stalker.c | 2 +- >>> arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- >>> arch/arm/mach-omap2/board-overo.c | 2 +- >>> arch/arm/mach-omap2/board-rx51.c | 2 +- >>> arch/arm/mach-omap2/board-zoom2.c | 2 +- >>> arch/arm/mach-omap2/board-zoom3.c | 2 +- >>> arch/arm/plat-omap/common.c | 10 ++-------- >>> arch/arm/plat-omap/include/plat/common.h | 3 +-- >>> 18 files changed, 19 insertions(+), 26 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c >>> index dd9c031..4961f3b 100644 >>> --- 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(); >>> } >> Maybe we should take it one step further and replace board_map_io >> functions with common omap3_map_io? > > Could be done yeah. If special handling is needed, it can still > be done in the board-*.c files. Care to do a patch for that? no problem. > Tony > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Sincerely yours, Mike. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] omap3: introduce omap3_map_io 2010-06-30 6:36 ` Tony Lindgren 2010-06-30 7:04 ` Mike Rapoport @ 2010-06-30 8:47 ` Mike Rapoport 2010-07-07 10:42 ` Tony Lindgren 1 sibling, 1 reply; 8+ messages in thread From: Mike Rapoport @ 2010-06-30 8:47 UTC (permalink / raw) Cc: linux-omap, Mike Rapoport, Sergio Aguirre, Tony Lindgren, Kevin Hilman Hi Tony, Here's the patch. It applies on top of Sergio's patch "Unify omap2_set_globals_3[43,6x]x functions". --- Most OMAP3-based boards use exactly the same code for .map_io method in the machine_desc structure. This patch introduces omap3_map_io and updates board-* files to use it as .map_io method. Signed-off-by: Mike Rapoport <mike@compulab.co.il> CC: Sergio Aguirre <saaguirre@ti.com> CC: Tony Lindgren <tony@atomide.com> CC: Kevin Hilman <khilman@deeprootsystems.com> --- arch/arm/mach-omap2/board-3430sdp.c | 8 +------- arch/arm/mach-omap2/board-3630sdp.c | 8 +------- arch/arm/mach-omap2/board-am3517evm.c | 8 +------- arch/arm/mach-omap2/board-cm-t35.c | 8 +------- arch/arm/mach-omap2/board-devkit8000.c | 8 +------- arch/arm/mach-omap2/board-igep0020.c | 8 +------- arch/arm/mach-omap2/board-ldp.c | 8 +------- arch/arm/mach-omap2/board-omap3beagle.c | 8 +------- arch/arm/mach-omap2/board-omap3evm.c | 8 +------- arch/arm/mach-omap2/board-omap3pandora.c | 8 +------- arch/arm/mach-omap2/board-omap3stalker.c | 8 +------- arch/arm/mach-omap2/board-omap3touchbook.c | 8 +------- arch/arm/mach-omap2/board-overo.c | 8 +------- arch/arm/mach-omap2/board-zoom2.c | 8 +------- arch/arm/mach-omap2/board-zoom3.c | 8 +------- arch/arm/plat-omap/common.c | 6 ++++++ arch/arm/plat-omap/include/plat/common.h | 2 ++ 17 files changed, 23 insertions(+), 105 deletions(-) diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 4961f3b..ecdd2c3 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -803,18 +803,12 @@ static void __init omap_3430sdp_init(void) usb_ehci_init(&ehci_pdata); } -static void __init omap_3430sdp_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board") /* Maintainer: Syed Khasim - Texas Instruments Inc */ .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap_3430sdp_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap_3430sdp_init_irq, .init_machine = omap_3430sdp_init, diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 72c2130..59860df 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -66,12 +66,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { .reset_gpio_port[2] = -EINVAL }; -static void __init omap_sdp_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - static struct omap_board_config_kernel sdp_config[] __initdata = { }; @@ -107,7 +101,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap_sdp_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap_sdp_init_irq, .init_machine = omap_sdp_init, diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 4356424..4d0f585 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -461,17 +461,11 @@ static void __init am3517_evm_init(void) am3517_evm_ethernet_init(&am3517_evm_emac_pdata); } -static void __init am3517_evm_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM") .phys_io = 0x48000000, .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = am3517_evm_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = am3517_evm_init_irq, .init_machine = am3517_evm_init, diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 6ce30b3..b910f72 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -708,12 +708,6 @@ static void __init cm_t35_init_irq(void) omap_gpio_init(); } -static void __init cm_t35_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - static struct omap_board_mux board_mux[] __initdata = { /* nCS and IRQ for CM-T35 ethernet */ OMAP3_MUX(GPMC_NCS5, OMAP_MUX_MODE0), @@ -836,7 +830,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") .phys_io = 0x48000000, .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = cm_t35_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = cm_t35_init_irq, .init_machine = cm_t35_init, diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 1164258..8233dd5 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -814,17 +814,11 @@ static void __init devkit8000_init(void) omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); } -static void __init devkit8000_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000") .phys_io = 0x48000000, .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = devkit8000_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = devkit8000_init_irq, .init_machine = devkit8000_init, diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index a8544ab..175f043 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -532,17 +532,11 @@ static void __init igep2_init(void) pr_warning("IGEP v2: Could not obtain gpio GPIO_WIFI_NRESET\n"); } -static void __init igep2_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(IGEP0020, "IGEP v2 board") .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = igep2_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = igep2_init_irq, .init_machine = igep2_init, diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 9bcb182..07e1f73 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -406,17 +406,11 @@ static void __init omap_ldp_init(void) ldp_vmmc1_supply.dev = mmc[0].dev; } -static void __init omap_ldp_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OMAP_LDP, "OMAP LDP board") .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap_ldp_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap_ldp_init_irq, .init_machine = omap_ldp_init, diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 7b95cc1..6a6d2d7 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -507,18 +507,12 @@ static void __init omap3_beagle_init(void) beagle_display_init(); } -static void __init omap3_beagle_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap3_beagle_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap3_beagle_init_irq, .init_machine = omap3_beagle_init, diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 65b46d4..6494dbd 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -715,18 +715,12 @@ static void __init omap3_evm_init(void) omap3_evm_display_init(); } -static void __init omap3_evm_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OMAP3EVM, "OMAP3 EVM") /* Maintainer: Syed Mohammed Khasim - Texas Instruments */ .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap3_evm_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap3_evm_init_irq, .init_machine = omap3_evm_init, diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 49feae4..4ac146b 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -590,17 +590,11 @@ static void __init omap3pandora_init(void) omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); } -static void __init omap3pandora_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console") .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap3pandora_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap3pandora_init_irq, .init_machine = omap3pandora_init, diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 497d429..bcd01d2 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -652,18 +652,12 @@ static void __init omap3_stalker_init(void) omap_mux_init_signal("sdr_cke1", OMAP_PIN_OUTPUT); } -static void __init omap3_stalker_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(SBC3530, "OMAP3 STALKER") /* Maintainer: Jason Lam -lzg@ema-tech.com */ .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap3_stalker_map_io, + .map_io = omap3_map_io, .init_irq = omap3_stalker_init_irq, .init_machine = omap3_stalker_init, .timer = &omap_timer, diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 77a0ace..69d431b 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -559,18 +559,12 @@ static void __init omap3_touchbook_init(void) omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); } -static void __init omap3_touchbook_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") /* Maintainer: Gregoire Gentil - http://www.alwaysinnovating.com */ .phys_io = 0x48000000, .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap3_touchbook_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap3_touchbook_init_irq, .init_machine = omap3_touchbook_init, diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index d62fc19..c1bbb48 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -522,17 +522,11 @@ static void __init overo_init(void) "OVERO_GPIO_USBH_CPEN\n"); } -static void __init overo_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OVERO, "Gumstix Overo") .phys_io = 0x48000000, .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = overo_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = overo_init_irq, .init_machine = overo_init, diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index 3d2deb4..161f729 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -84,17 +84,11 @@ static void __init omap_zoom2_init(void) zoom_debugboard_init(); } -static void __init omap_zoom2_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") .phys_io = ZOOM_UART_BASE, .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap_zoom2_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap_zoom2_init_irq, .init_machine = omap_zoom2_init, diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c index 91bc56a..ca9a79a 100644 --- a/arch/arm/mach-omap2/board-zoom3.c +++ b/arch/arm/mach-omap2/board-zoom3.c @@ -25,12 +25,6 @@ #include "mux.h" #include "sdram-hynix-h8mbx00u0mer-0em.h" -static void __init omap_zoom_map_io(void) -{ - omap2_set_globals_3xxx(); - omap34xx_map_common_io(); -} - static struct omap_board_config_kernel zoom_config[] __initdata = { }; @@ -76,7 +70,7 @@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") .phys_io = ZOOM_UART_BASE, .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, .boot_params = 0x80000100, - .map_io = omap_zoom_map_io, + .map_io = omap3_map_io, .reserve = omap_reserve, .init_irq = omap_zoom_init_irq, .init_machine = omap_zoom_init, diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 4631766..147529d 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -324,6 +324,12 @@ void __init omap2_set_globals_3xxx(void) { __omap2_set_globals(&omap3_globals); } + +void __init omap3_map_io(void) +{ + omap2_set_globals_3xxx(); + omap34xx_map_common_io(); +} #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 962aaeb..e9cf3da 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h @@ -68,6 +68,8 @@ void omap2_set_globals_control(struct omap_globals *); void omap2_set_globals_prcm(struct omap_globals *); void omap2_set_globals_uart(struct omap_globals *); +void omap3_map_io(void); + /** * omap_test_timeout - busy-loop, testing a condition * @cond: condition to test until it evaluates to true -- 1.6.6.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] omap3: introduce omap3_map_io 2010-06-30 8:47 ` [PATCH] omap3: introduce omap3_map_io Mike Rapoport @ 2010-07-07 10:42 ` Tony Lindgren 0 siblings, 0 replies; 8+ messages in thread From: Tony Lindgren @ 2010-07-07 10:42 UTC (permalink / raw) To: Mike Rapoport; +Cc: linux-omap, Sergio Aguirre, Kevin Hilman * Mike Rapoport <mike@compulab.co.il> [100630 11:46]: > Hi Tony, > Here's the patch. It applies on top of Sergio's patch "Unify > omap2_set_globals_3[43,6x]x functions". Thanks. I'll queue this one. However, it conflicts with the "ARM: OMAP: Convert to use ->reserve method to reserve boot time memory" patch, so I need to get a static commit from Russell to apply this on. Regards, Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-07-07 10:42 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-06-29 20:30 [RFC][PATCH] omap3: Unify omap2_set_globals_3[43,6x]x functions Sergio Aguirre 2010-06-29 22:24 ` Kevin Hilman 2010-07-07 10:34 ` Tony Lindgren 2010-06-30 5:25 ` Mike Rapoport 2010-06-30 6:36 ` Tony Lindgren 2010-06-30 7:04 ` Mike Rapoport 2010-06-30 8:47 ` [PATCH] omap3: introduce omap3_map_io Mike Rapoport 2010-07-07 10:42 ` Tony Lindgren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).