From patchwork Wed May 26 22:59:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 102521 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4QMxvU0000460 for ; Wed, 26 May 2010 22:59:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932392Ab0EZW74 (ORCPT ); Wed, 26 May 2010 18:59:56 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:59828 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980Ab0EZW74 (ORCPT ); Wed, 26 May 2010 18:59:56 -0400 Received: by pwi7 with SMTP id 7so429115pwi.19 for ; Wed, 26 May 2010 15:59:55 -0700 (PDT) Received: by 10.114.2.25 with SMTP id 25mr8209614wab.100.1274914795352; Wed, 26 May 2010 15:59:55 -0700 (PDT) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id c14sm4447201waa.1.2010.05.26.15.59.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 26 May 2010 15:59:54 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH] OMAP24xx: CM: fix mask used for checking IDLEST status Date: Wed, 26 May 2010 15:59:52 -0700 Message-Id: <1274914792-28235-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.0.2 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 26 May 2010 22:59:57 +0000 (UTC) diff --git a/arch/arm/mach-omap2/cm.c b/arch/arm/mach-omap2/cm.c index 2d83565..721c3b6 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);