diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-04-08 15:24:01 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:08 +0200 |
| commit | ca8a6476fcc9148d8e3ef380211ab99e9602099b (patch) | |
| tree | a6382c9eac665a699d1b7d274395c33d5e7cb03e /arch/arm | |
| parent | b67fc86ea7ef73b7b23bd8e0e04c304c4b0f6f3c (diff) | |
ARM: ux500: pm: remove udelay decouple gic
Remove udelay from decouple gic. It is not needed
for cpuidle since cpuidle has long udelays because of
timer migration before the pending interrupt check.
For suspend, the udelay is placed before checking pending
interrupt.
ST-Ericsson Linux next: Not tested, ask SSM for ER
ST-Ericsson ID: ER332789
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: If455113f68f1a11690010be358fda36447d5d919
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20645
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/pm/pm.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/pm/suspend.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/pm/pm.c b/arch/arm/mach-ux500/pm/pm.c index 06b8c270289..bdbdc544f87 100644 --- a/arch/arm/mach-ux500/pm/pm.c +++ b/arch/arm/mach-ux500/pm/pm.c @@ -221,7 +221,6 @@ void ux500_pm_gic_decouple(void) cpu_relax(); /* TODO: Use the ack bit when possible */ - udelay(100); } /* Recouple GIC with the interrupt bus */ diff --git a/arch/arm/mach-ux500/pm/suspend.c b/arch/arm/mach-ux500/pm/suspend.c index 99ad773a594..3b00ce4519b 100644 --- a/arch/arm/mach-ux500/pm/suspend.c +++ b/arch/arm/mach-ux500/pm/suspend.c @@ -11,7 +11,7 @@ #include <linux/suspend.h> #include <linux/gpio.h> - +#include <linux/delay.h> #include <linux/regulator/ab8500-debug.h> #include <mach/prcmu-fw-api.h> @@ -74,6 +74,9 @@ static int suspend(bool do_deepsleep) ux500_pm_gic_decouple(); + /* TODO: decouple gic should look at status bit.*/ + udelay(100); + divps_rate = ux500_pm_arm_on_ext_clk(false); if (ux500_pm_gic_pending_interrupt()) { |