Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / arch / arm / mach-imx / mach-imx6q.c

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index b5f89fd..7d80a0a 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -289,10 +289,13 @@ static void __init imx6q_init_machine(void)
 static void __init imx6q_init_late(void)
 {
        /*
-        * WAIT mode is broken on TO 1.0 and 1.1, so there is no point
-        * to run cpuidle on them.
+        * WAIT mode is broken on imx6 Dual/Quad revision 1.0 and 1.1 so
+        * there is no point to run cpuidle on them.
+        *
+        * It does work on imx6 Solo/DualLite starting from 1.1
         */
-       if (imx_get_soc_revision() > IMX_CHIP_REVISION_1_1)
+       if ((cpu_is_imx6q() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_1) ||
+           (cpu_is_imx6dl() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_0))
                imx6q_cpuidle_init();
 
        if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ))