diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-06-21 10:33:16 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:52:20 +0200 |
| commit | b9edaac39cf002c580bafcc8e2ba3a85b24c69fc (patch) | |
| tree | e562627d06bba7a509ccd1f7a5b3fda8590e33d9 | |
| parent | ebc449f71ee4afd0db60bb2cc41d6c48fc4a20ca (diff) | |
ARM: ux500: pm: Use relaxed read/write for gic
ST-Ericsson ID: -
ST-Ericsson Linux next: ER338824
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Change-Id: I5518c2dbefa417c9bc83d62d8ce19589bfd460ba
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25547
Reviewed-by: QATEST
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/pm/pm.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/pm/pm.c b/arch/arm/mach-ux500/pm/pm.c index b6442212324..4617cff1594 100644 --- a/arch/arm/mach-ux500/pm/pm.c +++ b/arch/arm/mach-ux500/pm/pm.c @@ -83,16 +83,14 @@ bool ux500_pm_gic_pending_interrupt(void) /* 5 registers. STI & PPI not skipped */ for (i = 0; i < GIC_NUMBER_REGS; i++) { - pr = readl(__io_address(U8500_GIC_DIST_BASE) + - GIC_DIST_PENDING_SET + i * 4); - er = readl(__io_address(U8500_GIC_DIST_BASE) + - GIC_DIST_ENABLE_SET + i * 4); + pr = readl_relaxed(__io_address(U8500_GIC_DIST_BASE) + + GIC_DIST_PENDING_SET + i * 4); + er = readl_relaxed(__io_address(U8500_GIC_DIST_BASE) + + GIC_DIST_ENABLE_SET + i * 4); if (pr & er) return true; /* There is a pending interrupt */ - } - return false; } @@ -130,7 +128,7 @@ void ux500_pm_prcmu_copy_gic_settings(void) for (i = 0; i < GIC_NUMBER_SPI_REGS; i++) { /* 4*32 SPI interrupts */ /* +1 due to skip STI and PPI */ - er = readl(IO_ADDRESS(U8500_GIC_DIST_BASE) + + er = readl_relaxed(__io_address(U8500_GIC_DIST_BASE) + GIC_DIST_ENABLE_SET + (i + 1) * 4); writel(er, PRCM_ARMITMSK31TO0 + i * 4); } @@ -151,7 +149,7 @@ void ux500_pm_gpio_save_wake_up_status(void) } for (i = 0; i < num_banks; i++) - ux500_gpio_wks[i] = readl(IO_ADDRESS(banks[i]) + NMK_GPIO_WKS); + ux500_gpio_wks[i] = readl(__io_address(banks[i]) + NMK_GPIO_WKS); } u32 ux500_pm_gpio_read_wake_up_status(unsigned int bank_num) |