Skip to contentSkip to conversation

gpio: samsung: Fix input mode setting function for GPIO int

PATCH New Eunki Kim 3 participants 3 messages Sep 27, 2012 – Oct 23, 2012

Subsystems (2)
lore
Share & tools
lore

Eunki Kim

author
#0 lore raw

PATCH 2/2 gpio: samsung: Fix input mode setting function for GPIO int

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.

---
 drivers/gpio/gpio-samsung.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/gpio/gpio-samsung.c +4 -1
index ba126cc..19caef4 100644
@@ -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);
}
}

Signature · 1 line
1.7.1
#1 lore raw

PATCH 2/2 gpio: samsung: Fix input mode setting function for GPIO int

Quoted 7 lines · Eunki Kim

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.

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

#2 lore raw

PATCH 2/2 gpio: samsung: Fix input mode setting function for GPIO int

Quoted 8 lines · Linus Walleij
Quoted 5 lines · Eunki Kim

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.

Quoted 9 lines
Quoted 2 lines

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 <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.