diff options
| author | Anson Huang <b20788@freescale.com> | 2014-02-13 16:50:11 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-08-27 18:11:02 -0500 |
| commit | 3b7031fa84d0054e869cc61c0b3f0c2fb80e33e1 (patch) | |
| tree | ca8914110d3189f69409b7ecac76ea17c6fa9b53 /arch/arm/mach-imx/cpuidle-imx6q.c | |
| parent | 02c85c8ba9c1f160351c937e94d4e6c81ce91abf (diff) | |
ENGR00298994 ARM: imx: enable cpuidle on i.mx6sx
Enable cpuidle on i.MX6SX, derive from i.MX6Q cpuidle driver.
Signed-off-by: Anson Huang <b20788@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/cpuidle-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/cpuidle-imx6q.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c index d74d0ce794ab..6b8125c8a48a 100644 --- a/arch/arm/mach-imx/cpuidle-imx6q.c +++ b/arch/arm/mach-imx/cpuidle-imx6q.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. + * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -13,6 +13,7 @@ #include "common.h" #include "cpuidle.h" +#include "hardware.h" static atomic_t master = ATOMIC_INIT(0); static DEFINE_SPINLOCK(master_lock); @@ -66,7 +67,8 @@ static struct cpuidle_driver imx6q_cpuidle_driver = { int __init imx6q_cpuidle_init(void) { /* Need to enable SCU standby for entering WAIT modes */ - imx_scu_standby_enable(); + if (!cpu_is_imx6sx()) + imx_scu_standby_enable(); /* Set cache lpm bit for reliable WAIT mode support */ imx6_set_cache_lpm_in_wait(true); |