diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-07-01 05:12:52 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@freescale.com> | 2014-07-18 10:11:33 +0200 |
| commit | a49fb63c87f743c1166a2b0a20f80fcb0cbd02b2 (patch) | |
| tree | ed8f94d4852d626bb30c26793d029f9188462d18 /arch/arm/mach-imx/mach-imx6q.c | |
| parent | ARM: imx_v4_v5_defconfig: Add USB device options (diff) | |
| download | linux-a49fb63c87f743c1166a2b0a20f80fcb0cbd02b2.tar.xz linux-a49fb63c87f743c1166a2b0a20f80fcb0cbd02b2.zip | |
ARM: mx6: Only check for 1.2GHz for mx6quad
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>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index e60456d85c9d..9b3a233cfc2b 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -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) |