Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272607
b: refs/heads/master
c: 35549ec
h: refs/heads/master
i:
  272605: 72efafb
  272603: 9df016d
  272599: 9d6907a
  272591: ec76b46
  272575: a218cd3
v: v3
  • Loading branch information
Benoit Cousson authored and Tony Lindgren committed Sep 27, 2011
1 parent 5a795b3 commit e9dafa5
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7bc0c4bac72375517d904e02c46da2a23e079e8b
refs/heads/master: 35549ec3c3e67188a8d3eac0167e950c46688c96
18 changes: 18 additions & 0 deletions trunk/arch/arm/mach-omap2/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ void __init omap2_set_globals_242x(void)
{
__omap2_set_globals(&omap242x_globals);
}

void __init omap242x_map_io(void)
{
omap2_set_globals_242x();
omap242x_map_common_io();
}
#endif

#if defined(CONFIG_SOC_OMAP2430)
Expand All @@ -74,6 +80,12 @@ void __init omap2_set_globals_243x(void)
{
__omap2_set_globals(&omap243x_globals);
}

void __init omap243x_map_io(void)
{
omap2_set_globals_243x();
omap243x_map_common_io();
}
#endif

#if defined(CONFIG_ARCH_OMAP3)
Expand Down Expand Up @@ -138,5 +150,11 @@ void __init omap2_set_globals_443x(void)
omap2_set_globals_control(&omap4_globals);
omap2_set_globals_prcm(&omap4_globals);
}

void __init omap4_map_io(void)
{
omap2_set_globals_443x();
omap44xx_map_common_io();
}
#endif

4 changes: 4 additions & 0 deletions trunk/arch/arm/plat-omap/include/plat/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ void omap2_set_globals_sdrc(struct omap_globals *);
void omap2_set_globals_control(struct omap_globals *);
void omap2_set_globals_prcm(struct omap_globals *);

void omap242x_map_io(void);
void omap243x_map_io(void);
void omap3_map_io(void);
void omap4_map_io(void);


/**
* omap_test_timeout - busy-loop, testing a condition
Expand Down

0 comments on commit e9dafa5

Please sign in to comment.