summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>2012-06-04 17:36:00 +0800
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-06-04 20:19:57 +0800
commiteab5fcff6c4e8d5843656a01f28e3c8451023d36 (patch)
tree050b27f9093866d19b73588716f5e00aafeb5e4f
parentd50f2b6a1a45624c3ff8b1f3b4ab227ca94ff1ae (diff)
pm: Fix for prcmu pending interrupt during suspend
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/pm/context.c35
1 files changed, 1 insertions, 34 deletions
diff --git a/arch/arm/mach-ux500/pm/context.c b/arch/arm/mach-ux500/pm/context.c
index 4aaf46fcea4..65aad08727e 100644
--- a/arch/arm/mach-ux500/pm/context.c
+++ b/arch/arm/mach-ux500/pm/context.c
@@ -657,7 +657,6 @@ void context_fsmc_restore(void)
void context_gpio_save(void)
{
int i;
- unsigned int rimsc, fimsc;
for (i = 0; i < GPIO_NUM_BANKS; i++) {
gpio_save[i][0] = readl(gpio_bankaddr[i] + NMK_GPIO_AFSLA);
@@ -668,22 +667,6 @@ void context_gpio_save(void)
gpio_save[i][6] = readl(gpio_bankaddr[i] + NMK_GPIO_SLPC);
}
- /* Mask GPIO140 and GPIO32 which gives
- * spurious interrupts during sleep
- */
- rimsc = readl(gpio_bankaddr[4] + NMK_GPIO_RIMSC);
- fimsc = readl(gpio_bankaddr[4] + NMK_GPIO_FIMSC);
- rimsc &= ~(0x1 << (140 % NMK_GPIO_PER_CHIP));
- fimsc &= ~(0x1 << (140 % NMK_GPIO_PER_CHIP));
- writel(rimsc, gpio_bankaddr[4] + NMK_GPIO_RIMSC);
- writel(fimsc, gpio_bankaddr[4] + NMK_GPIO_FIMSC);
-
- rimsc = readl(gpio_bankaddr[1] + NMK_GPIO_RIMSC);
- fimsc = readl(gpio_bankaddr[1] + NMK_GPIO_FIMSC);
- rimsc &= ~0x1;
- fimsc &= ~0x1;
- writel(rimsc, gpio_bankaddr[1] + NMK_GPIO_RIMSC);
- writel(fimsc, gpio_bankaddr[1] + NMK_GPIO_FIMSC);
}
/*
@@ -697,7 +680,6 @@ void context_gpio_restore(void)
u32 pull_up;
u32 pull_down;
u32 pull;
- unsigned int rimsc, fimsc;
for (i = 0; i < GPIO_NUM_BANKS; i++) {
writel(gpio_save[i][2], gpio_bankaddr[i] + NMK_GPIO_PDIS);
@@ -734,22 +716,7 @@ void context_gpio_restore(void)
writel(gpio_save[i][6], gpio_bankaddr[i] + NMK_GPIO_SLPC);
}
- /* Restore Masks for GPIO140 and GPIO32 which gives
- * spurious interrupts during sleep
- */
- rimsc = readl(gpio_bankaddr[4] + NMK_GPIO_RIMSC);
- fimsc = readl(gpio_bankaddr[4] + NMK_GPIO_FIMSC);
- rimsc |= (0x1 << 140 % NMK_GPIO_PER_CHIP);
- fimsc |= (0x1 << 140 % NMK_GPIO_PER_CHIP);
- writel(rimsc, gpio_bankaddr[4] + NMK_GPIO_RIMSC);
- writel(fimsc, gpio_bankaddr[4] + NMK_GPIO_FIMSC);
-
- rimsc = readl(gpio_bankaddr[1] + NMK_GPIO_RIMSC);
- fimsc = readl(gpio_bankaddr[1] + NMK_GPIO_FIMSC);
- rimsc |= 0x1;
- fimsc |= 0x1;
- writel(rimsc, gpio_bankaddr[1] + NMK_GPIO_RIMSC);
- writel(fimsc, gpio_bankaddr[1] + NMK_GPIO_FIMSC);
+
}
/*