diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-10-29 20:50:21 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-08 12:33:07 -0700 |
| commit | b6a4226c14001b0aa20b11c69190cb89d2237d3d (patch) | |
| tree | e7c0f4b571cc010767c01d8b402762e49540c563 /arch/arm/mach-omap2/prcm.c | |
| parent | 76e0e16d91af22dd6313000ff8018069123f8ed0 (diff) | |
| download | linux-next-b6a4226c14001b0aa20b11c69190cb89d2237d3d.tar.gz | |
ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code
Get rid of the mach-omap2/common.c globals by moving the global
initialization for IP block addresses that must occur early into
mach-omap2/io.c. In the process, remove the *_map_common_io*() and
SoC-specific *set_globals* functions.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/prcm.c')
| -rw-r--r-- | arch/arm/mach-omap2/prcm.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 05c754edbf3f..92fc3b88a608 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -137,16 +137,13 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, return (i < MAX_MODULE_ENABLE_WAIT) ? 1 : 0; }; -void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) +void __init omap2_set_globals_prcm(void __iomem *prm, void __iomem *cm, + void __iomem *cm2, void __iomem *prcm_mpu) { - if (omap2_globals->prm) - prm_base = omap2_globals->prm; - if (omap2_globals->cm) - cm_base = omap2_globals->cm; - if (omap2_globals->cm2) - cm2_base = omap2_globals->cm2; - if (omap2_globals->prcm_mpu) - prcm_mpu_base = omap2_globals->prcm_mpu; + prm_base = prm; + cm_base = cm; + cm2_base = cm2; + prcm_mpu_base = prcm_mpu; if (cpu_is_omap44xx() || soc_is_omap54xx()) { omap_prm_base_init(); |