From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
To: linux-omap@vger.kernel.org
Cc: khilman@ti.com, tony@atomide.com,
linux-arm-kernel@lists.infradead.org, Charulatha V <charu@ti.com>
Subject: [PATCH v9 12/31] gpio/omap: use pinctrl offset instead of macro
Date: Wed, 14 Dec 2011 01:50:14 +0530 [thread overview]
Message-ID: <1323807633-23713-13-git-send-email-tarun.kanti@ti.com> (raw)
In-Reply-To: <1323807633-23713-1-git-send-email-tarun.kanti@ti.com>
From: Charulatha V <charu@ti.com>
Use regs->pinctrl field instead of using the macro OMAP1510_GPIO_PIN_CONTROL
Signed-off-by: Charulatha V <charu@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap1/gpio15xx.c | 1 +
arch/arm/plat-omap/include/plat/gpio.h | 1 +
drivers/gpio/gpio-omap.c | 8 +++-----
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
index 2adfece..950e467 100644
--- a/arch/arm/mach-omap1/gpio15xx.c
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@ -85,6 +85,7 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = {
.irqenable = OMAP1510_GPIO_INT_MASK,
.irqenable_inv = true,
.irqctrl = OMAP1510_GPIO_INT_CONTROL,
+ .pinctrl = OMAP1510_GPIO_PIN_CONTROL,
};
static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index d291e4d..d4e6080 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -198,6 +198,7 @@ struct omap_gpio_reg_offs {
u16 irqctrl;
u16 edgectrl1;
u16 edgectrl2;
+ u16 pinctrl;
bool irqenable_inv;
};
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index b9d50cc..87c54a1 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -491,15 +491,13 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
*/
_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE);
-#ifdef CONFIG_ARCH_OMAP15XX
- if (bank->method == METHOD_GPIO_1510) {
- void __iomem *reg;
+ if (bank->regs->pinctrl) {
+ void __iomem *reg = bank->base + bank->regs->pinctrl;
/* Claim the pin for MPU */
- reg = bank->base + OMAP1510_GPIO_PIN_CONTROL;
__raw_writel(__raw_readl(reg) | (1 << offset), reg);
}
-#endif
+
if (bank->regs->ctrl && !bank->mod_usage) {
void __iomem *reg = bank->base + bank->regs->ctrl;
u32 ctrl;
--
1.7.0.4
next prev parent reply other threads:[~2011-12-13 20:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-13 20:20 [PATCH v9 00/31] gpio/omap: driver cleanup and fixes Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 01/31] gpio/omap: remove dependency on gpio_bank_count Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 02/31] gpio/omap: use flag to identify wakeup domain Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 03/31] gpio/omap: make gpio_context part of gpio_bank structure Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 04/31] gpio/omap: handle save/restore context in GPIO driver Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 05/31] gpio/omap: make non-wakeup GPIO part of pdata Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 06/31] gpio/omap: avoid cpu checks during module ena/disable Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 07/31] gpio/omap: further cleanup using wkup_en register Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 08/31] gpio/omap: use level/edge detect reg offsets Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 09/31] gpio/omap: remove hardcoded offsets in context save/restore Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 10/31] gpio/omap: cleanup set_gpio_triggering function Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 11/31] gpio/omap: cleanup omap_gpio_mod_init function Tarun Kanti DebBarma
2011-12-13 20:20 ` Tarun Kanti DebBarma [this message]
2011-12-13 20:20 ` [PATCH v9 13/31] gpio/omap: remove unnecessary bit-masking for read access Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 14/31] gpio/omap: remove bank->method & METHOD_* macros Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 15/31] gpio/omap: fix bankwidth for OMAP7xx MPUIO Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 16/31] gpio/omap: use pm-runtime framework Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 17/31] gpio/omap: optimize suspend and resume functions Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 18/31] gpio/omap: cleanup prepare_for_idle and resume_after_idle Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 19/31] gpio/omap: fix debounce clock handling Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 20/31] gpio/omap: fix incorrect access of debounce module Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 21/31] gpio/omap: remove omap_gpio_save_context overhead Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 22/31] gpio/omap: save and restore debounce registers Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 23/31] gpio/omap: enable irq at the end of all configuration in restore Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 24/31] gpio/omap: restore OE only after setting the output level Tarun Kanti DebBarma
2011-12-13 20:20 ` [PATCH v9 25/31] gpio/omap: handle set_dataout reg capable IP on restore Tarun Kanti DebBarma
2011-12-16 7:28 ` [PATCH v9 00/31] gpio/omap: driver cleanup and fixes Shilimkar, Santosh
2011-12-16 8:24 ` DebBarma, Tarun Kanti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323807633-23713-13-git-send-email-tarun.kanti@ti.com \
--to=tarun.kanti@ti.com \
--cc=charu@ti.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).