From patchwork Thu Jun 3 17:13:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 104143 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 o53HDR2s010884 for ; Thu, 3 Jun 2010 17:13:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753430Ab0FCRNZ (ORCPT ); Thu, 3 Jun 2010 13:13:25 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:55725 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012Ab0FCRNZ (ORCPT ); Thu, 3 Jun 2010 13:13:25 -0400 Received: by pwj2 with SMTP id 2so174507pwj.19 for ; Thu, 03 Jun 2010 10:13:24 -0700 (PDT) Received: by 10.114.54.1 with SMTP id c1mr7340269waa.61.1275585204518; Thu, 03 Jun 2010 10:13:24 -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 n29sm669785wae.16.2010.06.03.10.13.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Jun 2010 10:13:23 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH] OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg Date: Thu, 3 Jun 2010 10:13:22 -0700 Message-Id: <1275585202-9637-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]); Thu, 03 Jun 2010 17:13:27 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 2e96771..b88737f 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -99,7 +99,7 @@ static void omap3_enable_io_chain(void) /* Do a readback to assure write has been done */ prm_read_mod_reg(WKUP_MOD, PM_WKEN); - while (!(prm_read_mod_reg(WKUP_MOD, PM_WKST) & + while (!(prm_read_mod_reg(WKUP_MOD, PM_WKEN) & OMAP3430_ST_IO_CHAIN_MASK)) { timeout++; if (timeout > 1000) { @@ -108,7 +108,7 @@ static void omap3_enable_io_chain(void) return; } prm_set_mod_reg_bits(OMAP3430_ST_IO_CHAIN_MASK, - WKUP_MOD, PM_WKST); + WKUP_MOD, PM_WKEN); } } }