summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>2012-03-28 11:24:55 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-03-29 11:30:52 +0200
commitdc30048769e9f403249bc98a9265e9817194bdc7 (patch)
treebd32faa26badfeb99c87a9875b4e8d56dcfdff22
parentcce23d071d06cacefc17f7f4b7557d953fbc29fb (diff)
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 <naveen.gaddipati@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/pm/runtime.c13
1 files 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);