From patchwork Mon Apr 26 07:04:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 94992 X-Patchwork-Delegate: paul@pwsan.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 o3Q77jXo006520 for ; Mon, 26 Apr 2010 07:07:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754565Ab0DZHHo (ORCPT ); Mon, 26 Apr 2010 03:07:44 -0400 Received: from utopia.booyaka.com ([72.9.107.138]:52240 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754339Ab0DZHHe (ORCPT ); Mon, 26 Apr 2010 03:07:34 -0400 Received: (qmail 31388 invoked by uid 1019); 26 Apr 2010 07:07:33 -0000 MBOX-Line: From nobody Mon Apr 26 01:04:27 2010 Subject: [PATCH 05/10] OMAP3: PM: PM_MPUGRPSEL writes should use GRPSEL macros, not EN macros To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org From: Paul Walmsley Cc: Kevin Hilman , Jouni =?utf-8?b?SMO2Z2FuZGVy?= Date: Mon, 26 Apr 2010 01:04:27 -0600 Message-ID: <20100426070425.9743.93097.stgit@localhost.localdomain> In-Reply-To: <20100426070217.9743.92728.stgit@localhost.localdomain> References: <20100426070217.9743.92728.stgit@localhost.localdomain> User-Agent: StGit/0.15-52-gc391 MIME-Version: 1.0 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]); Mon, 26 Apr 2010 07:07:45 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e46a5e2..f2d3145 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -885,8 +885,9 @@ static void __init prcm_setup_regs(void) OMAP3430_EN_GPT1_MASK | OMAP3430_EN_GPT12_MASK, WKUP_MOD, PM_WKEN); /* No need to write EN_IO, that is always enabled */ - prm_write_mod_reg(OMAP3430_EN_GPIO1_MASK | OMAP3430_EN_GPT1_MASK | - OMAP3430_EN_GPT12_MASK, + prm_write_mod_reg(OMAP3430_GRPSEL_GPIO1_MASK | + OMAP3430_GRPSEL_GPT1_MASK | + OMAP3430_GRPSEL_GPT12_MASK, WKUP_MOD, OMAP3430_PM_MPUGRPSEL); /* For some reason IO doesn't generate wakeup event even if * it is selected to mpu wakeup goup */ @@ -905,11 +906,15 @@ static void __init prcm_setup_regs(void) OMAP3430_EN_MCBSP4_MASK, OMAP3430_PER_MOD, PM_WKEN); /* and allow them to wake up MPU */ - prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2_MASK | OMAP3430_EN_GPIO3_MASK | - OMAP3430_GRPSEL_GPIO4_MASK | OMAP3430_EN_GPIO5_MASK | - OMAP3430_GRPSEL_GPIO6_MASK | OMAP3430_EN_UART3_MASK | - OMAP3430_EN_MCBSP2_MASK | OMAP3430_EN_MCBSP3_MASK | - OMAP3430_EN_MCBSP4_MASK, + prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2_MASK | + OMAP3430_GRPSEL_GPIO3_MASK | + OMAP3430_GRPSEL_GPIO4_MASK | + OMAP3430_GRPSEL_GPIO5_MASK | + OMAP3430_GRPSEL_GPIO6_MASK | + OMAP3430_GRPSEL_UART3_MASK | + OMAP3430_GRPSEL_MCBSP2_MASK | + OMAP3430_GRPSEL_MCBSP3_MASK | + OMAP3430_GRPSEL_MCBSP4_MASK, OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL); /* Don't attach IVA interrupts */