diff options
| author | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-11-02 09:52:04 +0800 |
|---|---|---|
| committer | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-11-02 11:17:35 +0800 |
| commit | 801957d4eb81dee0cd9016b8b5dfc409bb0ef27d (patch) | |
| tree | be6fe9782d4f070142bd027374bc56967ed5d727 | |
| parent | 095e4767100747a31e62663fc9ab3dbcb7285ec7 (diff) | |
ENGR00161209 dvfs: disable dvfs before start suspend
dvfs will active during suspend, will cause system hang sometime.
disable it before system enter suspend and enable it after resume.
Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
| -rw-r--r-- | arch/arm/plat-mxc/dvfs_core.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/dvfs_core.c b/arch/arm/plat-mxc/dvfs_core.c index 166623af1582..4d796183d493 100644 --- a/arch/arm/plat-mxc/dvfs_core.c +++ b/arch/arm/plat-mxc/dvfs_core.c @@ -41,6 +41,7 @@ #include <linux/input.h> #include <linux/platform_device.h> #include <linux/cpufreq.h> +#include <linux/suspend.h> #include <mach/hardware.h> #include <mach/mxc_dvfs.h> @@ -828,6 +829,34 @@ static DEVICE_ATTR(down_threshold, 0644, downthreshold_show, downthreshold_store); static DEVICE_ATTR(down_count, 0644, downcount_show, downcount_store); +static int dvfs_notifier(struct notifier_block *nb, + unsigned long event, void *dummy) +{ + switch (event) { + case PM_SUSPEND_PREPARE: + if (dvfs_core_is_active) { + dvfs_core_resume = 1; + printk(KERN_INFO "dvfs: disable dvfs before suspend\n"); + stop_dvfs(); + } + break; + + case PM_POST_SUSPEND: + if (dvfs_core_resume) { + dvfs_core_resume = 0; + printk(KERN_INFO "dvfs: enable dvfs after resume\n"); + start_dvfs(); + } + break; + } + + return 0; +} + +static struct notifier_block dvfs_notifier_block = { + .notifier_call = dvfs_notifier, +}; + /*! * This is the probe routine for the DVFS driver. * @@ -953,6 +982,8 @@ static int __devinit mxc_dvfs_core_probe(struct platform_device *pdev) dvfs_core_resume = 0; cpufreq_trig_needed = 0; + register_pm_notifier(&dvfs_notifier_block); + return err; err3: free_irq(dvfs_data->irq, dvfs_dev); @@ -1013,8 +1044,6 @@ static struct platform_driver mxc_dvfs_core_driver = { .shutdown = mxc_dvfscore_shutdown, }, .probe = mxc_dvfs_core_probe, - .suspend = mxc_dvfs_core_suspend, - .resume = mxc_dvfs_core_resume, }; static int __init dvfs_init(void) |