diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-07-26 16:34:28 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-07-26 16:34:28 -0600 |
| commit | 6405616754f70a11c5410b321495fcd61e70b240 (patch) | |
| tree | 97c0b4e0ab00e753f7e5fa444091b28dc5ce1e4a | |
| parent | fb2fc9204f8ce060d239ab41f09cf6fc6de5ad4b (diff) | |
| download | linux-6405616754f70a11c5410b321495fcd61e70b240.tar.bz2 | |
OMAP24xx: CM: fix mask used for checking IDLEST status
On OMAP24xx, the polarity for the IDLEST bits is opposite of OMAP3.
The mask used to check this was using the bit position instead of the
bit mask.
This patch fixes the problem by using the bit mask instead of the bit
field.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
| -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); |