From patchwork Fri Oct 2 18:14:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 51409 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n92IF0dw010864 for ; Fri, 2 Oct 2009 18:15:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758028AbZJBSPD (ORCPT ); Fri, 2 Oct 2009 14:15:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758027AbZJBSPD (ORCPT ); Fri, 2 Oct 2009 14:15:03 -0400 Received: from mail-px0-f179.google.com ([209.85.216.179]:43925 "EHLO mail-px0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758025AbZJBSPB (ORCPT ); Fri, 2 Oct 2009 14:15:01 -0400 Received: by mail-px0-f179.google.com with SMTP id 9so1347643pxi.4 for ; Fri, 02 Oct 2009 11:15:05 -0700 (PDT) Received: by 10.114.119.6 with SMTP id r6mr1649149wac.45.1254507304518; Fri, 02 Oct 2009 11:15:04 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 22sm785213pzk.14.2009.10.02.11.15.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 02 Oct 2009 11:15:04 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/5] OMAP3: PM: Enable GPIO module-level wakeups Date: Fri, 2 Oct 2009 11:14:55 -0700 Message-Id: <1254507295-11381-6-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.4.3 In-Reply-To: <1254507295-11381-5-git-send-email-khilman@deeprootsystems.com> References: <1254507295-11381-1-git-send-email-khilman@deeprootsystems.com> <1254507295-11381-2-git-send-email-khilman@deeprootsystems.com> <1254507295-11381-3-git-send-email-khilman@deeprootsystems.com> <1254507295-11381-4-git-send-email-khilman@deeprootsystems.com> <1254507295-11381-5-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index cf6ea9f..378c2f6 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -639,6 +639,16 @@ static void __init prcm_setup_regs(void) prm_write_mod_reg(OMAP3430_IO_EN | OMAP3430_WKUP_EN, OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET); + /* Enable GPIO wakeups in PER */ + prm_write_mod_reg(OMAP3430_EN_GPIO2 | OMAP3430_EN_GPIO3 | + OMAP3430_EN_GPIO4 | OMAP3430_EN_GPIO5 | + OMAP3430_EN_GPIO6, OMAP3430_PER_MOD, PM_WKEN); + /* and allow them to wake up MPU */ + prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2 | OMAP3430_EN_GPIO3 | + OMAP3430_GRPSEL_GPIO4 | OMAP3430_EN_GPIO5 | + OMAP3430_GRPSEL_GPIO6, + OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL); + /* Don't attach IVA interrupts */ prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL); prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1);