summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:21:55 -0600
committerQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:21:55 -0600
commit4b95b168a9eccf248bf9ed55f844ac20c6f48df7 (patch)
treedf1a0e928b78799955ee4a67f54b3a822d165617
parent4a7100ce06730fab7194361aec7e9aa447afe4fb (diff)
Bugzilla 627. Prevent DPM from calling DVFS when DVFS is not enabled.
Patch for Bugzilla 627. Prevent DPM from calling DVFS when DVFS is not enabled on the linux 2.6.22 kernel for MX platforms. http://www.bitshrine.org/gpp/linux-2.6.22-mx-Bugzilla-627.-Prevent-DPM-from-calling-DVF.patch
-rw-r--r--arch/arm/mach-mx27/dpm.c2
-rw-r--r--arch/arm/mach-mx3/dpm.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx27/dpm.c b/arch/arm/mach-mx27/dpm.c
index 9aacfcbdd347..1662923413b5 100644
--- a/arch/arm/mach-mx27/dpm.c
+++ b/arch/arm/mach-mx27/dpm.c
@@ -120,7 +120,9 @@ static int mxc_dpm_set_opt(struct dpm_opt *cur, struct dpm_opt *new)
md_new->cpu / 1000);
}
#ifdef CONFIG_PM
+#ifdef CONFIG_MXC_DVFS
mxc_pm_dvfs(md_new->cpu, md_new->ahb, md_new->ip);
+#endif
curr_mode = md_new->mode;
#endif
diff --git a/arch/arm/mach-mx3/dpm.c b/arch/arm/mach-mx3/dpm.c
index caeed74925fa..e05a6816c669 100644
--- a/arch/arm/mach-mx3/dpm.c
+++ b/arch/arm/mach-mx3/dpm.c
@@ -120,7 +120,9 @@ static int mxc_dpm_set_opt(struct dpm_opt *cur, struct dpm_opt *new)
md_new->cpu / 1000);
}
#ifdef CONFIG_PM
+#ifdef CONFIG_MXC_DVFS
mxc_pm_dvfs(md_new->cpu, md_new->ahb, md_new->ip);
+#endif
curr_mode = md_new->mode;
#endif