git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
gpio.c
diff --git
a/arch/arm/plat-omap/gpio.c
b/arch/arm/plat-omap/gpio.c
index
337199e
..
76a347b
100644
(file)
--- a/
arch/arm/plat-omap/gpio.c
+++ b/
arch/arm/plat-omap/gpio.c
@@
-2140,18
+2140,18
@@
void omap2_gpio_resume_after_retention(void)
if (gen) {
u32 old0, old1;
if (gen) {
u32 old0, old1;
- if (cpu_is_omap24xx() || cpu_is_omap
4
4xx()) {
+ if (cpu_is_omap24xx() || cpu_is_omap
3
4xx()) {
old0 = __raw_readl(bank->base +
OMAP24XX_GPIO_LEVELDETECT0);
old1 = __raw_readl(bank->base +
OMAP24XX_GPIO_LEVELDETECT1);
old0 = __raw_readl(bank->base +
OMAP24XX_GPIO_LEVELDETECT0);
old1 = __raw_readl(bank->base +
OMAP24XX_GPIO_LEVELDETECT1);
- __raw_writel(old0 | gen, bank->base +
+
__raw_writel(old0 | gen, bank->base +
OMAP24XX_GPIO_LEVELDETECT0);
OMAP24XX_GPIO_LEVELDETECT0);
- __raw_writel(old1 | gen, bank->base +
+
__raw_writel(old1 | gen, bank->base +
OMAP24XX_GPIO_LEVELDETECT1);
OMAP24XX_GPIO_LEVELDETECT1);
- __raw_writel(old0, bank->base +
+
__raw_writel(old0, bank->base +
OMAP24XX_GPIO_LEVELDETECT0);
OMAP24XX_GPIO_LEVELDETECT0);
- __raw_writel(old1, bank->base +
+
__raw_writel(old1, bank->base +
OMAP24XX_GPIO_LEVELDETECT1);
}
OMAP24XX_GPIO_LEVELDETECT1);
}