* [PATCH 2/2] gpio: samsung: Fix input mode setting function for GPIO int
@ 2012-09-27 3:55 Eunki Kim
2012-09-27 5:48 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: Eunki Kim @ 2012-09-27 3:55 UTC (permalink / raw)
To: linux-arm-kernel
This patch makes GPIO pin to INTERRUPT mode or INPUT mode according
to bitmap_gpio_int. When the related bit of bitmap_gpio_int is set,
it makes GPIO pin to INTERRUPT mode instrad of INPUT mode in the
samsung_gpiolib_4bit_input function.
Signed-off-by: Eunki Kim <eunki_kim@samsung.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
---
drivers/gpio/gpio-samsung.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index ba126cc..19caef4 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -596,7 +596,10 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
unsigned long con;
con = __raw_readl(base + GPIOCON_OFF);
- con &= ~(0xf << con_4bit_shift(offset));
+ if (ourchip->bitmap_gpio_int & BIT(offset))
+ con |= 0xf << con_4bit_shift(offset);
+ else
+ con &= ~(0xf << con_4bit_shift(offset));
__raw_writel(con, base + GPIOCON_OFF);
gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
@@ -1018,6 +1021,8 @@ static void __init samsung_gpiolib_add_4bit_chips(struct samsung_gpio_chip
*chip
if ((base != NULL) && (chip->base == NULL))
chip->base = base + ((i) * 0x20);
+ chip->bitmap_gpio_int = 0;
+
samsung_gpiolib_add(chip);
}
}
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] gpio: samsung: Fix input mode setting function for GPIO int
2012-09-27 3:55 [PATCH 2/2] gpio: samsung: Fix input mode setting function for GPIO int Eunki Kim
@ 2012-09-27 5:48 ` Linus Walleij
2012-10-23 14:16 ` Kukjin Kim
0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2012-09-27 5:48 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Sep 27, 2012 at 5:55 AM, Eunki Kim <eunki_kim@samsung.com> wrote:
> This patch makes GPIO pin to INTERRUPT mode or INPUT mode according
> to bitmap_gpio_int. When the related bit of bitmap_gpio_int is set,
> it makes GPIO pin to INTERRUPT mode instrad of INPUT mode in the
> samsung_gpiolib_4bit_input function.
>
> Signed-off-by: Eunki Kim <eunki_kim@samsung.com>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Are you taking this into the Samsung tree or shall I merge it
into my GPIO tree? In the latter case I need an ACK from
some Samsung maintainer.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] gpio: samsung: Fix input mode setting function for GPIO int
2012-09-27 5:48 ` Linus Walleij
@ 2012-10-23 14:16 ` Kukjin Kim
0 siblings, 0 replies; 3+ messages in thread
From: Kukjin Kim @ 2012-10-23 14:16 UTC (permalink / raw)
To: linux-arm-kernel
Linus Walleij wrote:
>
> On Thu, Sep 27, 2012 at 5:55 AM, Eunki Kim <eunki_kim@samsung.com> wrote:
>
> > This patch makes GPIO pin to INTERRUPT mode or INPUT mode according
> > to bitmap_gpio_int. When the related bit of bitmap_gpio_int is set,
> > it makes GPIO pin to INTERRUPT mode instrad of INPUT mode in the
> > samsung_gpiolib_4bit_input function.
> >
> > Signed-off-by: Eunki Kim <eunki_kim@samsung.com>
> > Cc: Kukjin Kim <kgene.kim@samsung.com>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> Are you taking this into the Samsung tree or shall I merge it
> into my GPIO tree? In the latter case I need an ACK from
> some Samsung maintainer.
>
Hi, Linus
Let me pick this into Samsung tree with your ack :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-23 14:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27 3:55 [PATCH 2/2] gpio: samsung: Fix input mode setting function for GPIO int Eunki Kim
2012-09-27 5:48 ` Linus Walleij
2012-10-23 14:16 ` Kukjin Kim
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).