openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

omap: hwmod: Populate _mpu_rt_va later on in omap_hwmod_late_init 

Otherwise ioremap can fail with early_init patch unless we have
a static mapping for everything.

Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2011-02-14 15:40:21 -08:00
parent 3e16f92536
commit e7c7d76085
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -1467,12 +1467,10 @@ static int __init _register(struct omap_hwmod *oh)
return -EEXIST; return -EEXIST;
ms_id = _find_mpu_port_index(oh); ms_id = _find_mpu_port_index(oh);
if (!IS_ERR_VALUE(ms_id)) { if (!IS_ERR_VALUE(ms_id))
oh->_mpu_port_index = ms_id; oh->_mpu_port_index = ms_id;
oh->_mpu_rt_va = _find_mpu_rt_base(oh, oh->_mpu_port_index); else
} else {
oh->_int_flags |= _HWMOD_NO_MPU_PORT; oh->_int_flags |= _HWMOD_NO_MPU_PORT;
}
list_add_tail(&oh->node, &omap_hwmod_list); list_add_tail(&oh->node, &omap_hwmod_list);
@ -1621,6 +1619,26 @@ int __init omap_hwmod_init(struct omap_hwmod **ohs)
return 0; return 0;
} }
/*
* _populate_mpu_rt_base - populate the virtual address for a hwmod
*
* Must be called only from omap_hwmod_late_init so ioremap works properly.
* Assumes the caller takes care of locking if needed.
*
*/
static int __init _populate_mpu_rt_base(struct omap_hwmod *oh, void *data)
{
if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
return 0;
oh->_mpu_rt_va = _find_mpu_rt_base(oh, oh->_mpu_port_index);
if (!oh->_mpu_rt_va)
pr_warning("omap_hwmod: %s found no _mpu_rt_va for %s\n",
__func__, oh->name);
return 0;
}
/** /**
* omap_hwmod_late_init - do some post-clock framework initialization * omap_hwmod_late_init - do some post-clock framework initialization
* *
@ -1632,6 +1650,8 @@ static int __init omap_hwmod_late_init(void)
{ {
int r; int r;
r = omap_hwmod_for_each(_populate_mpu_rt_base, NULL);
/* XXX check return value */ /* XXX check return value */
r = omap_hwmod_for_each(_init_clocks, NULL); r = omap_hwmod_for_each(_init_clocks, NULL);
WARN(r, "omap_hwmod: omap_hwmod_late_init(): _init_clocks failed\n"); WARN(r, "omap_hwmod: omap_hwmod_late_init(): _init_clocks failed\n");