diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2011-09-23 16:23:09 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-26 20:49:15 -0400 |
| commit | 35549ec3c3e67188a8d3eac0167e950c46688c96 (patch) | |
| tree | f130886a25349cee5da25b78d6c7e466e30bc9a6 | |
| parent | 7bc0c4bac72375517d904e02c46da2a23e079e8b (diff) | |
ARM: OMAP2+: Add SoC specific map_io functions
Add SoC specific map_io function to be used by the generic DT
board file. This is an intermediate step before having some
generic DT aware map_io function.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/common.c | 18 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/common.h | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 3f20cbb9967b..de61f15c48e2 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c | |||
| @@ -56,6 +56,12 @@ void __init omap2_set_globals_242x(void) | |||
| 56 | { | 56 | { |
| 57 | __omap2_set_globals(&omap242x_globals); | 57 | __omap2_set_globals(&omap242x_globals); |
| 58 | } | 58 | } |
| 59 | |||
| 60 | void __init omap242x_map_io(void) | ||
| 61 | { | ||
| 62 | omap2_set_globals_242x(); | ||
| 63 | omap242x_map_common_io(); | ||
| 64 | } | ||
| 59 | #endif | 65 | #endif |
| 60 | 66 | ||
| 61 | #if defined(CONFIG_SOC_OMAP2430) | 67 | #if defined(CONFIG_SOC_OMAP2430) |
| @@ -74,6 +80,12 @@ void __init omap2_set_globals_243x(void) | |||
| 74 | { | 80 | { |
| 75 | __omap2_set_globals(&omap243x_globals); | 81 | __omap2_set_globals(&omap243x_globals); |
| 76 | } | 82 | } |
| 83 | |||
| 84 | void __init omap243x_map_io(void) | ||
| 85 | { | ||
| 86 | omap2_set_globals_243x(); | ||
| 87 | omap243x_map_common_io(); | ||
| 88 | } | ||
| 77 | #endif | 89 | #endif |
| 78 | 90 | ||
| 79 | #if defined(CONFIG_ARCH_OMAP3) | 91 | #if defined(CONFIG_ARCH_OMAP3) |
| @@ -138,5 +150,11 @@ void __init omap2_set_globals_443x(void) | |||
| 138 | omap2_set_globals_control(&omap4_globals); | 150 | omap2_set_globals_control(&omap4_globals); |
| 139 | omap2_set_globals_prcm(&omap4_globals); | 151 | omap2_set_globals_prcm(&omap4_globals); |
| 140 | } | 152 | } |
| 153 | |||
| 154 | void __init omap4_map_io(void) | ||
| 155 | { | ||
| 156 | omap2_set_globals_443x(); | ||
| 157 | omap44xx_map_common_io(); | ||
| 158 | } | ||
| 141 | #endif | 159 | #endif |
| 142 | 160 | ||
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index 5cac97e36079..abda2c7e499b 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h | |||
| @@ -83,7 +83,11 @@ void omap2_set_globals_sdrc(struct omap_globals *); | |||
| 83 | void omap2_set_globals_control(struct omap_globals *); | 83 | void omap2_set_globals_control(struct omap_globals *); |
| 84 | void omap2_set_globals_prcm(struct omap_globals *); | 84 | void omap2_set_globals_prcm(struct omap_globals *); |
| 85 | 85 | ||
| 86 | void omap242x_map_io(void); | ||
| 87 | void omap243x_map_io(void); | ||
| 86 | void omap3_map_io(void); | 88 | void omap3_map_io(void); |
| 89 | void omap4_map_io(void); | ||
| 90 | |||
| 87 | 91 | ||
| 88 | /** | 92 | /** |
| 89 | * omap_test_timeout - busy-loop, testing a condition | 93 | * omap_test_timeout - busy-loop, testing a condition |
