summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRoel Kluin2010-02-18 20:54:11 +0100
committerPaulius Zaleckas2010-02-18 20:54:11 +0100
commit079e1091a2901c81fc2d7ad2079344c3edab2c4d (patch)
treeb57e88f20abe2ffe52fb0ca9e12c273a7a65efd6 /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff)
downloadkernel-qcow2-linux-079e1091a2901c81fc2d7ad2079344c3edab2c4d.tar.gz
kernel-qcow2-linux-079e1091a2901c81fc2d7ad2079344c3edab2c4d.tar.xz
kernel-qcow2-linux-079e1091a2901c81fc2d7ad2079344c3edab2c4d.zip
Gemini: wrong registers used to set reg_level in gpio_set_irq_type()
It appears the wrong GPIO registers were used Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-gemini/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-gemini/gpio.c b/arch/arm/mach-gemini/gpio.c
index e7263854bc7b..fe3bd5ac8b10 100644
--- a/arch/arm/mach-gemini/gpio.c
+++ b/arch/arm/mach-gemini/gpio.c
@@ -86,7 +86,7 @@ static int gpio_set_irq_type(unsigned int irq, unsigned int type)
unsigned int reg_both, reg_level, reg_type;
reg_type = __raw_readl(base + GPIO_INT_TYPE);
- reg_level = __raw_readl(base + GPIO_INT_BOTH_EDGE);
+ reg_level = __raw_readl(base + GPIO_INT_LEVEL);
reg_both = __raw_readl(base + GPIO_INT_BOTH_EDGE);
switch (type) {
@@ -117,7 +117,7 @@ static int gpio_set_irq_type(unsigned int irq, unsigned int type)
}
__raw_writel(reg_type, base + GPIO_INT_TYPE);
- __raw_writel(reg_level, base + GPIO_INT_BOTH_EDGE);
+ __raw_writel(reg_level, base + GPIO_INT_LEVEL);
__raw_writel(reg_both, base + GPIO_INT_BOTH_EDGE);
gpio_ack_irq(irq);