UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Rabin Vincent 2010-05-06 10:40:47 +01:00 committed by Russell King
parent 591d8dd71c
commit 6b07aaedc0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/plat-nomadik/gpio.c
View File

@ -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);
}