summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBai Ping <b51503@freescale.com>2015-03-20 03:29:28 +0800
committerBai Ping <b51503@freescale.com>2015-03-20 17:46:22 +0800
commit91cf351a2afc17ac4a260e4d2ad1e32d00925a1b (patch)
tree6ebe9b68ab8280ad653677611be2b8580b9d21c4
parentc8b88cd2ec6681dcef4c72be7adff9f0ed6721e4 (diff)
MLK-10439: arm: imx: fix system hang after resume back under low busfreqrel_imx_3.14.28_1.0.0_ga
System will be no response after resume back under low busfreq mode. The root cause of this issue is that when the system is under ultra_low_bus_freq mode on i.MX6SL, resume process has a low bus mode deamon in background, cause system enter low bus mode twice, busfreq driver will notify thermal driver to turn off PLL3 twice, and cause PLL3 usecount incorrect and UART no message out. Signed-off-by: Bai Ping <b51503@freescale.com>
-rw-r--r--arch/arm/mach-imx/busfreq-imx6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/busfreq-imx6.c b/arch/arm/mach-imx/busfreq-imx6.c
index 7d65d08a4653..af7982ffffb8 100644
--- a/arch/arm/mach-imx/busfreq-imx6.c
+++ b/arch/arm/mach-imx/busfreq-imx6.c
@@ -786,7 +786,7 @@ void __init imx6_busfreq_map_io(void)
static void bus_freq_daemon_handler(struct work_struct *work)
{
mutex_lock(&bus_freq_mutex);
- if ((!low_bus_freq_mode) && (high_bus_count == 0) &&
+ if ((!low_bus_freq_mode) && (!ultra_low_bus_freq_mode) && (high_bus_count == 0) &&
(med_bus_count == 0) && (audio_bus_count == 0))
set_low_bus_freq();
mutex_unlock(&bus_freq_mutex);