From abd93d5d47440aa5d0b935c3947b6076d07daa65 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Gaddipati Date: Wed, 28 Mar 2012 11:24:55 +0200 Subject: mach_ux500:pm:Disabled the suspend code By disbaling the suspend we could avoid the hangs in suspend and resume. This workaround will be removed once the power management supports for all other peripheral drivers. Signed-off-by: Naveen Kumar Gaddipati --- arch/arm/mach-ux500/pm/runtime.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/pm/runtime.c b/arch/arm/mach-ux500/pm/runtime.c index a91e90443d9..710bd8aae3d 100644 --- a/arch/arm/mach-ux500/pm/runtime.c +++ b/arch/arm/mach-ux500/pm/runtime.c @@ -201,7 +201,7 @@ static int ux500_pd_resume_noirq(struct device *dev) */ return ux500_pd_runtime_resume(dev); } - +#ifdef CONFIG_UX500_SUSPEND static int ux500_pd_amba_suspend_noirq(struct device *dev) { struct pm_runtime_data *prd = __to_prd(dev); @@ -257,7 +257,16 @@ static int ux500_pd_amba_resume_noirq(struct device *dev) return ret; } - +#else +static int ux500_pd_amba_suspend_noirq(struct device *dev) +{ + return 0; +} +static int ux500_pd_amba_resume_noirq(struct device *dev) +{ + return 0; +} +#endif static int ux500_pd_amba_runtime_suspend(struct device *dev) { struct pm_runtime_data *prd = __to_prd(dev); -- cgit v1.2.3