OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: OMAP4+: PM: Centralize static dependency mapping table 

As we add more static dependency mapping for various errata, the logic
gets clunkier. Since it is a simple lookup and map logic, centralize the
same and provide the mapping as  a simple list.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Nishanth Menon 2014-10-21 15:22:29 -05:00 committed by Tony Lindgren
parent 9008d83fe9
commit b9f5fe6425
1 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
arch/arm/mach-omap2/pm44xx.c
View File

@ -37,6 +37,16 @@ struct power_state {
struct list_head node; struct list_head node;
}; };
/**
* struct static_dep_map - Static dependency map
* @from: from clockdomain
* @to: to clockdomain
*/
struct static_dep_map {
const char *from;
const char *to;
};
static u32 cpu_suspend_state = PWRDM_POWER_OFF; static u32 cpu_suspend_state = PWRDM_POWER_OFF;
static LIST_HEAD(pwrst_list); static LIST_HEAD(pwrst_list);
@ -148,18 +158,6 @@ static void omap_default_idle(void)
omap_do_wfi(); omap_do_wfi();
} }
/**
* omap4_init_static_deps - Add OMAP4 static dependencies
*
* Add needed static clockdomain dependencies on OMAP4 devices.
* Return: 0 on success or 'err' on failures
*/
static inline int omap4_init_static_deps(void)
{
struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm;
struct clockdomain *ducati_clkdm, *l3_2_clkdm;
int ret = 0;
/* /*
* The dynamic dependency between MPUSS -> MEMIF and * The dynamic dependency between MPUSS -> MEMIF and
* MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as
@ -170,54 +168,53 @@ static inline int omap4_init_static_deps(void)
* from the 32K counter. The BUG applies for GPTIMER1 and WDT2 which * from the 32K counter. The BUG applies for GPTIMER1 and WDT2 which
* are part of L4 wakeup clockdomain. * are part of L4 wakeup clockdomain.
*/ */
mpuss_clkdm = clkdm_lookup("mpuss_clkdm"); static const struct static_dep_map omap4_static_dep_map[] = {
emif_clkdm = clkdm_lookup("l3_emif_clkdm"); {.from = "mpuss_clkdm", .to = "l3_emif_clkdm"},
l3_1_clkdm = clkdm_lookup("l3_1_clkdm"); {.from = "mpuss_clkdm", .to = "l3_1_clkdm"},
l3_2_clkdm = clkdm_lookup("l3_2_clkdm"); {.from = "mpuss_clkdm", .to = "l3_2_clkdm"},
ducati_clkdm = clkdm_lookup("ducati_clkdm"); {.from = "ducati_clkdm", .to = "l3_1_clkdm"},
if ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) || {.from = "ducati_clkdm", .to = "l3_2_clkdm"},
(!l3_2_clkdm) || (!ducati_clkdm)) {.from = NULL} /* TERMINATION */
return -EINVAL; };
ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm); static const struct static_dep_map omap5_dra7_static_dep_map[] = {
ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm); {.from = "mpu_clkdm", .to = "emif_clkdm"},
ret |= clkdm_add_wkdep(mpuss_clkdm, l3_2_clkdm); {.from = NULL} /* TERMINATION */
ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm); };
ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);
if (ret) {
pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 wakeup dependency\n");
return -EINVAL;
}
return ret;
}
/** /**
* omap5_dra7_init_static_deps - Init static clkdm dependencies on OMAP5 and * omap4plus_init_static_deps() - Initialize a static dependency map
* DRA7 * @map: Mapping of clock domains
*
* The dynamic dependency between MPUSS -> EMIF is broken and has
* not worked as expected. The hardware recommendation is to
* enable static dependencies for these to avoid system
* lock ups or random crashes.
*/ */
static inline int omap5_dra7_init_static_deps(void) static inline int omap4plus_init_static_deps(const struct static_dep_map *map)
{ {
struct clockdomain *mpuss_clkdm, *emif_clkdm;
int ret; int ret;
struct clockdomain *from, *to;
mpuss_clkdm = clkdm_lookup("mpu_clkdm"); if (!map)
emif_clkdm = clkdm_lookup("emif_clkdm"); return 0;
if (!mpuss_clkdm || !emif_clkdm)
while (map->from) {
from = clkdm_lookup(map->from);
to = clkdm_lookup(map->to);
if (!from || !to) {
pr_err("Failed lookup %s or %s for wakeup dependency\n",
map->from, map->to);
return -EINVAL; return -EINVAL;
}
ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm); ret = clkdm_add_wkdep(from, to);
if (ret) if (ret) {
pr_err("Failed to add MPUSS -> EMIF wakeup dependency\n"); pr_err("Failed to add %s -> %s wakeup dependency(%d)\n",
map->from, map->to, ret);
return ret; return ret;
} }
map++;
};
return 0;
}
/** /**
* omap4_pm_init_early - Does early initialization necessary for OMAP4+ devices * omap4_pm_init_early - Does early initialization necessary for OMAP4+ devices
* *
@ -268,9 +265,9 @@ int __init omap4_pm_init(void)
} }
if (cpu_is_omap44xx()) if (cpu_is_omap44xx())
ret = omap4_init_static_deps(); ret = omap4plus_init_static_deps(omap4_static_dep_map);
else if (soc_is_omap54xx() || soc_is_dra7xx()) else if (soc_is_omap54xx() || soc_is_dra7xx())
ret = omap5_dra7_init_static_deps(); ret = omap4plus_init_static_deps(omap5_dra7_static_dep_map);
if (ret) { if (ret) {
pr_err("Failed to initialise static dependencies.\n"); pr_err("Failed to initialise static dependencies.\n");