]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: mx6: Only check for 1.2GHz for mx6quad
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 1 Jul 2014 03:12:52 +0000 (00:12 -0300)
committerShawn Guo <shawn.guo@freescale.com>
Fri, 18 Jul 2014 08:11:33 +0000 (16:11 +0800)
It is only the mx6quad variant that can run up to 1.2GHz, so add the check
accordingly.

This avoids getting the following warning on a mx6solo:

failed to disable 1.2 GHz OPP

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
arch/arm/mach-imx/mach-imx6q.c

index e60456d85c9d867218eca5e244034ef348592376..9b3a233cfc2b65339ebf156f9d2db7464e63404e 100644 (file)
@@ -320,7 +320,7 @@ static void __init imx6q_opp_check_speed_grading(struct device *cpu_dev)
        val >>= OCOTP_CFG3_SPEED_SHIFT;
        val &= 0x3;
 
-       if (val != OCOTP_CFG3_SPEED_1P2GHZ)
+       if ((val != OCOTP_CFG3_SPEED_1P2GHZ) && cpu_is_imx6q())
                if (dev_pm_opp_disable(cpu_dev, 1200000000))
                        pr_warn("failed to disable 1.2 GHz OPP\n");
        if (val < OCOTP_CFG3_SPEED_996MHZ)