diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 08:46:24 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 08:46:24 +0300 |
| commit | 331d919af416b9b92428947ef8c535a3e24c6b31 (patch) | |
| tree | 1f58dfe4ea6ed130f7b970f07cd7589864e9cbad /arch/arm/mach-omap2/cm.c | |
| parent | 047b51fb208c716294b4682c904df8a3ad8b6a69 (diff) | |
| parent | fb8ce14c7e16bd218decb3e1655c5d4ff08042f2 (diff) | |
Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/cm.c')
| -rw-r--r-- | arch/arm/mach-omap2/cm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cm.c b/arch/arm/mach-omap2/cm.c index 2d83565d2be2..721c3b66740a 100644 --- a/arch/arm/mach-omap2/cm.c +++ b/arch/arm/mach-omap2/cm.c @@ -50,15 +50,15 @@ int omap2_cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift) cm_idlest_reg = cm_idlest_offs[idlest_id - 1]; + mask = 1 << idlest_shift; + if (cpu_is_omap24xx()) - ena = idlest_shift; + ena = mask; else if (cpu_is_omap34xx()) ena = 0; else BUG(); - mask = 1 << idlest_shift; - /* XXX should be OMAP2 CM */ omap_test_timeout(((cm_read_mod_reg(prcm_mod, cm_idlest_reg) & mask) == ena), MAX_MODULE_READY_TIME, i); |