From: Kevin Hilman <khilman@ti.com>
To: linux-omap@vger.kernel.org,
Grant Likely <grant.likely@secretlab.ca>,
Linus Walleij <linus.walleij@stericsson.com>
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/14] GPIO: OMAP: _get_gpio_irqbank_mask: replace hard-coded mask with bank->width
Date: Fri, 20 May 2011 17:14:47 +0200 [thread overview]
Message-ID: <1305904497-26013-5-git-send-email-khilman@ti.com> (raw)
In-Reply-To: <1305904497-26013-1-git-send-email-khilman@ti.com>
Replace hard-coded mask values with bank->width which is already coming
from platform_data.
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
drivers/gpio/gpio_omap.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/gpio/gpio_omap.c b/drivers/gpio/gpio_omap.c
index 4691ed8..1b7896e 100644
--- a/drivers/gpio/gpio_omap.c
+++ b/drivers/gpio/gpio_omap.c
@@ -718,46 +718,40 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)
void __iomem *reg = bank->base;
int inv = 0;
u32 l;
- u32 mask;
+ u32 mask = (1 << bank->width) - 1;
switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO:
reg += OMAP_MPUIO_GPIO_MASKIT / bank->stride;
- mask = 0xffff;
inv = 1;
break;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_INT_MASK;
- mask = 0xffff;
inv = 1;
break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610:
reg += OMAP1610_GPIO_IRQENABLE1;
- mask = 0xffff;
break;
#endif
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
case METHOD_GPIO_7XX:
reg += OMAP7XX_GPIO_INT_MASK;
- mask = 0xffffffff;
inv = 1;
break;
#endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_IRQENABLE1;
- mask = 0xffffffff;
break;
#endif
#if defined(CONFIG_ARCH_OMAP4)
case METHOD_GPIO_44XX:
reg += OMAP4_GPIO_IRQSTATUSSET0;
- mask = 0xffffffff;
break;
#endif
default:
--
1.7.3.4
next prev parent reply other threads:[~2011-05-20 15:15 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 15:14 [PATCH 00/14] GPIO: OMAP: first round of cleanup Kevin Hilman
2011-05-20 15:14 ` [PATCH 01/14] GPIO: OMAP: _clear_gpio_irqbank: fix flushing of posted write Kevin Hilman
2011-05-20 15:14 ` [PATCH 02/14] GPIO: OMAP: remove MPUIO handling from _clear_gpio_irqbank() Kevin Hilman
2011-05-20 15:14 ` [PATCH 03/14] GPIO: OMAP: move bank width into struct gpio_bank Kevin Hilman
2011-05-20 15:14 ` Kevin Hilman [this message]
2011-05-20 15:14 ` [PATCH 05/14] GPIO: OMAP: replace get_gpio_index() by using bank width Kevin Hilman
2011-05-20 15:14 ` [PATCH 06/14] GPIO: OMAP: remove get_gpio_bank() Kevin Hilman
2011-05-20 15:14 ` [PATCH 07/14] GPIO: OMAP: consolidate direction, input, output, remove #ifdefs Kevin Hilman
2011-05-20 15:14 ` [PATCH 08/14] GPIO: OMAP: consolidate IRQ status handling, " Kevin Hilman
2011-05-20 15:14 ` [PATCH 09/14] GPIO: OMAP: conslidate enable/disable of GPIO IRQs, remove ifdefs Kevin Hilman
2011-05-20 15:14 ` [PATCH 10/14] GPIO: OMAP: convert MPUIO IRQ over to generic irq_chip Kevin Hilman
2011-05-20 15:14 ` [PATCH 11/14] GPIO: OMAP: remove useless gpio_valid() & check_gpio() checks Kevin Hilman
2011-05-20 15:14 ` [PATCH 12/14] GPIO: OMAP: cleanup _set_gpio_wakeup(), remove ifdefs Kevin Hilman
2011-05-20 15:14 ` [PATCH 13/14] GPIO: OMAP: debounce remove SoC specific registers, use pdata Kevin Hilman
2011-05-20 15:14 ` [PATCH 14/14] GPIO: OMAP: cleanup show revision, remove cpu_is checks, display only once Kevin Hilman
2011-05-22 6:28 ` [PATCH 00/14] GPIO: OMAP: first round of cleanup Jean-Christophe PLAGNIOL-VILLARD
2011-05-27 3:24 ` Grant Likely
2011-05-27 15:49 ` Kevin Hilman
2011-06-16 16:07 ` Kevin Hilman
2011-06-16 16:26 ` Grant Likely
2011-06-16 18:16 ` Kevin Hilman
2011-06-16 19:32 ` Grant Likely
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=1305904497-26013-5-git-send-email-khilman@ti.com \
--to=khilman@ti.com \
--cc=grant.likely@secretlab.ca \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/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