From: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Thu, 6 May 2010 09:40:47 +0000 (+0100)
Subject: ARM: 6099/1: nomadik-gpio: fix mask/unmask
X-Git-Tag: 2.1b_release~8404^2~4^6~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b07aaedc029d507501a931aabfd3d0a70f1828f;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

ARM: 6099/1: nomadik-gpio: fix mask/unmask

Mask/unmask should modify the interrupt mask register (RIMSC
and FIMSC) not the wakeup mask registers (RWIMSC and FWIMSC).

Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 092f380..38fc3b5 100644
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -123,14 +123,14 @@ static void nmk_gpio_irq_mask(unsigned int irq)
 	/* we must individually clear the two edges */
 	spin_lock_irqsave(&nmk_chip->lock, flags);
 	if (nmk_chip->edge_rising & bitmask) {
-		reg = readl(nmk_chip->addr + NMK_GPIO_RWIMSC);
+		reg = readl(nmk_chip->addr + NMK_GPIO_RIMSC);
 		reg &= ~bitmask;
-		writel(reg, nmk_chip->addr + NMK_GPIO_RWIMSC);
+		writel(reg, nmk_chip->addr + NMK_GPIO_RIMSC);
 	}
 	if (nmk_chip->edge_falling & bitmask) {
-		reg = readl(nmk_chip->addr + NMK_GPIO_FWIMSC);
+		reg = readl(nmk_chip->addr + NMK_GPIO_FIMSC);
 		reg &= ~bitmask;
-		writel(reg, nmk_chip->addr + NMK_GPIO_FWIMSC);
+		writel(reg, nmk_chip->addr + NMK_GPIO_FIMSC);
 	}
 	spin_unlock_irqrestore(&nmk_chip->lock, flags);
 };
@@ -151,14 +151,14 @@ static void nmk_gpio_irq_unmask(unsigned int irq)
 	/* we must individually set the two edges */
 	spin_lock_irqsave(&nmk_chip->lock, flags);
 	if (nmk_chip->edge_rising & bitmask) {
-		reg = readl(nmk_chip->addr + NMK_GPIO_RWIMSC);
+		reg = readl(nmk_chip->addr + NMK_GPIO_RIMSC);
 		reg |= bitmask;
-		writel(reg, nmk_chip->addr + NMK_GPIO_RWIMSC);
+		writel(reg, nmk_chip->addr + NMK_GPIO_RIMSC);
 	}
 	if (nmk_chip->edge_falling & bitmask) {
-		reg = readl(nmk_chip->addr + NMK_GPIO_FWIMSC);
+		reg = readl(nmk_chip->addr + NMK_GPIO_FIMSC);
 		reg |= bitmask;
-		writel(reg, nmk_chip->addr + NMK_GPIO_FWIMSC);
+		writel(reg, nmk_chip->addr + NMK_GPIO_FIMSC);
 	}
 	spin_unlock_irqrestore(&nmk_chip->lock, flags);
 }