diff options
| -rw-r--r-- | arch/arm/mach-ux500/pm/context.c | 35 |
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 9dbbc9a7fdd..5902b861930 100644 --- a/arch/arm/mach-ux500/pm/context.c +++ b/arch/arm/mach-ux500/pm/context.c @@ -662,7 +662,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); @@ -673,22 +672,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); } /* @@ -702,7 +685,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); @@ -739,22 +721,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); + } /* |