Skip to content

Commit

Permalink
ARM: OMAP: Add calls to omap2_set_globals_*()
Browse files Browse the repository at this point in the history
Add the omap2_set_globals_{242x,243x,343x}() functions. These
functions are called early upon boot in the map_io() functions in the
board-specific init files.

This patch was accidentally left out of the earlier series.

This fixes omap2 booting as noted by Kyungmin Park <kmpark@infradead.org>.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kyungmin Park <kmpark@infradead.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Paul Walmsley authored and Tony Lindgren committed May 9, 2008
1 parent 0a4b53a commit c8d2eb8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-2430sdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-apollon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-h4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
4 changes: 4 additions & 0 deletions include/asm-arm/arch-omap/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit c8d2eb8

Please sign in to comment.