diff options
| -rw-r--r-- | arch/arm/mach-mx6/system.c | 2 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/cpufreq.c | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/arch/arm/mach-mx6/system.c b/arch/arm/mach-mx6/system.c index 686c58c1e0e5..800c7cc4e8bd 100644 --- a/arch/arm/mach-mx6/system.c +++ b/arch/arm/mach-mx6/system.c @@ -195,7 +195,7 @@ void mxc_cpu_lp_set(enum mxc_cpu_pwr_mode mode) __raw_writel(__raw_readl(MXC_CCM_CCR) & (~MXC_CCM_CCR_WB_COUNT_MASK) & (~MXC_CCM_CCR_REG_BYPASS_CNT_MASK), MXC_CCM_CCR); - udelay(60); + udelay(80); /* Reconfigurate WB and RBC counter */ __raw_writel(__raw_readl(MXC_CCM_CCR) | (0x1 << MXC_CCM_CCR_WB_COUNT_OFFSET) | diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c index 6e6353abee1c..bdc89f007349 100755 --- a/arch/arm/plat-mxc/cpufreq.c +++ b/arch/arm/plat-mxc/cpufreq.c @@ -248,8 +248,11 @@ void mxc_cpufreq_suspend(void) pre_suspend_rate = clk_get_rate(cpu_clk); /*set flag and raise up cpu frequency if needed*/ cpu_freq_suspend_in = 1; - if (pre_suspend_rate != (imx_freq_table[0].frequency * 1000)) + if (pre_suspend_rate != (imx_freq_table[0].frequency * 1000)) { set_cpu_freq(imx_freq_table[0].frequency * 1000); + loops_per_jiffy = cpufreq_scale(loops_per_jiffy, + pre_suspend_rate / 1000, imx_freq_table[0].frequency); + } cpu_freq_suspend_in = 2; mutex_unlock(&set_cpufreq_lock); @@ -259,8 +262,11 @@ void mxc_cpufreq_resume(void) { mutex_lock(&set_cpufreq_lock); cpu_freq_suspend_in = 1; - if (clk_get_rate(cpu_clk) != pre_suspend_rate) + if (clk_get_rate(cpu_clk) != pre_suspend_rate) { set_cpu_freq(pre_suspend_rate); + loops_per_jiffy = cpufreq_scale(loops_per_jiffy, + imx_freq_table[0].frequency, pre_suspend_rate / 1000); + } cpu_freq_suspend_in = 0; mutex_unlock(&set_cpufreq_lock); } @@ -270,16 +276,22 @@ void mxc_cpufreq_resume(void) static int mxc_cpufreq_suspend(struct cpufreq_policy *policy) { pre_suspend_rate = clk_get_rate(cpu_clk); - if (pre_suspend_rate != (imx_freq_table[0].frequency * 1000)) + if (pre_suspend_rate != (imx_freq_table[0].frequency * 1000)) { set_cpu_freq(imx_freq_table[0].frequency * 1000); + loops_per_jiffy = cpufreq_scale(loops_per_jiffy, + pre_suspend_rate / 1000, imx_freq_table[0].frequency); + } return 0; } static int mxc_cpufreq_resume(struct cpufreq_policy *policy) { - if (clk_get_rate(cpu_clk) != pre_suspend_rate) + if (clk_get_rate(cpu_clk) != pre_suspend_rate) { set_cpu_freq(pre_suspend_rate); + loops_per_jiffy = cpufreq_scale(loops_per_jiffy, + imx_freq_table[0].frequency, pre_suspend_rate / 1000); + } return 0; } #endif |