summaryrefslogtreecommitdiff
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorBai Ping <ping.bai@nxp.com>2017-04-24 18:45:17 +0800
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit190dcca38c704ffa6521cf8b6e5ab56a344c66ae (patch)
tree8f3eaee377790aaaddd9df22e1ecc5d3d0ef0cb4 /drivers/cpufreq
parentf80d127b6185106abba210fa58d97ed9c85f98bc (diff)
MLK-14747 driver: cpufreq: Correct dc regulator voltage on imx6ull
On i.MX6ULL EVK board, when the overdrive mode(900MHz/800MHz) is enable, the DC regulator voltage should not be changed. Keep the DC regulator to default 1.4V. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit e4b51b651ae95226c0ae0447673c64b23b079ee6) Conflicts: drivers/cpufreq/imx6q-cpufreq.c
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/imx6q-cpufreq.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 6d4a7bba7b7f..dbcf35b456b8 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2013-2015 Freescale Semiconductor, Inc.
- * Copyright (C) 2017 NXP
+ * Copyright (C) 2013-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP.
*
* 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
@@ -26,7 +26,7 @@
#define DC_VOLTAGE_MAX 1400000
#define FREQ_1P2_GHZ 1200000000
#define FREQ_396_MHZ 396000
-#define FREQ_696_MHZ 696000
+#define FREQ_528_MHZ 528000
#define FREQ_198_MHZ 198000
#define FREQ_24_MHZ 24000
@@ -423,10 +423,10 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
}
/*
- * On i.MX6UL EVK board, if the SOC is run in overide frequency,
+ * On i.MX6UL/ULL EVK board, if the SOC is run in overide frequency,
* the dc_regulator voltage should not be touched.
*/
- if (freq_table[num - 1].frequency == FREQ_696_MHZ)
+ if (freq_table[num - 1].frequency > FREQ_528_MHZ)
ignore_dc_reg = true;
if (!IS_ERR(dc_reg) && !ignore_dc_reg)
regulator_set_voltage_tol(dc_reg, DC_VOLTAGE_MIN, 0);