diff options
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()) { |