From patchwork Mon Feb 28 10:57:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: charu@ti.com X-Patchwork-Id: 595291 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1SAueJi004507 for ; Mon, 28 Feb 2011 10:56:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753586Ab1B1K4i (ORCPT ); Mon, 28 Feb 2011 05:56:38 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:37845 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753559Ab1B1K4g (ORCPT ); Mon, 28 Feb 2011 05:56:36 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p1SAuTnx008388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 28 Feb 2011 04:56:31 -0600 Received: from ucmsshproxy.india.ext.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with SMTP id p1SAuS0Z005936; Mon, 28 Feb 2011 16:26:28 +0530 (IST) Received: from x0084895-pc (unknown [10.24.244.92]) by ucmsshproxy.india.ext.ti.com (Postfix) with ESMTP id 2E348158003; Mon, 28 Feb 2011 16:26:28 +0530 (IST) From: Charulatha V To: linux-omap@vger.kernel.org Cc: khilman@ti.com, tony@atomide.com, paul@pwsan.com, Charulatha V Subject: [PATCH 2/5] OMAP: GPIO: use pwrdmn name to find wkup dmn GPIO Date: Mon, 28 Feb 2011 16:27:47 +0530 Message-Id: <1298890670-5481-3-git-send-email-charu@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1298890670-5481-1-git-send-email-charu@ti.com> References: <1298890670-5481-1-git-send-email-charu@ti.com> 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 28 Feb 2011 10:56:42 +0000 (UTC) diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 413de18..39b0d96 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -24,6 +24,8 @@ #include #include +#include "powerdomain.h" + static struct omap_device_pm_latency omap_gpio_latency[] = { [0] = { .deactivate_func = omap_device_idle_hwmods, @@ -39,6 +41,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) struct omap_gpio_dev_attr *dev_attr; char *name = "omap_gpio"; int id; + struct powerdomain *pwrdm; /* * extract the device id from name field available in the @@ -75,6 +78,9 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) return -EINVAL; } + pwrdm = omap_hwmod_get_pwrdm(oh); + strcpy(pdata->pwrdm_name, pwrdm->name); + od = omap_device_build(name, id - 1, oh, pdata, sizeof(*pdata), omap_gpio_latency, ARRAY_SIZE(omap_gpio_latency), diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index c6ab0ff..ff341ec 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -172,6 +172,7 @@ struct gpio_bank { struct device *dev; bool dbck_flag; int stride; + const char *pwrdm_name; }; /* @@ -1720,6 +1721,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) bank->dbck_flag = pdata->dbck_flag; bank->stride = pdata->bank_stride; bank_width = pdata->bank_width; + bank->pwrdm_name = pdata->pwrdm_name; spin_lock_init(&bank->lock); @@ -1865,16 +1867,15 @@ static int workaround_enabled; void omap2_gpio_prepare_for_idle(int off_mode) { int i, c = 0; - int min = 0; - if (cpu_is_omap34xx()) - min = 1; - - for (i = min; i < gpio_bank_count; i++) { + for (i = 0; i < gpio_bank_count; i++) { struct gpio_bank *bank = &gpio_bank[i]; u32 l1 = 0, l2 = 0; int j; + if (!strcmp(bank->pwrdm_name, "wkup_pwrdm")) + continue; + for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) clk_disable(bank->dbck); @@ -1934,15 +1935,15 @@ void omap2_gpio_prepare_for_idle(int off_mode) void omap2_gpio_resume_after_idle(void) { int i; - int min = 0; - if (cpu_is_omap34xx()) - min = 1; - for (i = min; i < gpio_bank_count; i++) { + for (i = 0; i < gpio_bank_count; i++) { struct gpio_bank *bank = &gpio_bank[i]; u32 l = 0, gen, gen0, gen1; int j; + if (!strcmp(bank->pwrdm_name, "wkup_pwrdm")) + continue; + for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) clk_enable(bank->dbck); @@ -2037,8 +2038,12 @@ void omap_gpio_save_context(void) int i; /* saving banks from 2-6 only since GPIO1 is in WKUP */ - for (i = 1; i < gpio_bank_count; i++) { + for (i = 0; i < gpio_bank_count; i++) { struct gpio_bank *bank = &gpio_bank[i]; + + if (!strcmp(bank->pwrdm_name, "wkup_pwrdm")) + continue; + bank->context.irqenable1 = __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE1); bank->context.irqenable2 = @@ -2067,8 +2072,12 @@ void omap_gpio_restore_context(void) { int i; - for (i = 1; i < gpio_bank_count; i++) { + for (i = 0; i < gpio_bank_count; i++) { struct gpio_bank *bank = &gpio_bank[i]; + + if (!strcmp(bank->pwrdm_name, "wkup_pwrdm")) + continue; + __raw_writel(bank->context.irqenable1, bank->base + OMAP24XX_GPIO_IRQENABLE1); __raw_writel(bank->context.irqenable2, diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h index d6f9fa0..2c46caa 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/arch/arm/plat-omap/include/plat/gpio.h @@ -77,6 +77,7 @@ struct omap_gpio_platform_data { int bank_width; /* GPIO bank width */ int bank_stride; /* Only needed for omap1 MPUIO */ bool dbck_flag; /* dbck required or not - True for OMAP3&4 */ + char pwrdm_name[20]; /* bank powerdomain name */ }; /* TODO: Analyze removing gpio_bank_count usage from driver code */