Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 90ff4d1c3500a92a83e78e2fb856b90d844f7a0a

Authored by Bai Ping
1 parent 495204bd6f
Exists in smarc-imx_4.9.11_1.0.0_ga and in 1 other branch smarc-imx7_4.9.11_1.0.0_ga

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

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

drivers/cpufreq/imx6q-cpufreq.c
Diff comments   View file @ 90ff4d1
1 1 /*
2   - * Copyright (C) 2013-2015 Freescale Semiconductor, Inc.
3   - * Copyright (C) 2017 NXP
  2 + * Copyright (C) 2013-2016 Freescale Semiconductor, Inc.
  3 + * Copyright 2017 NXP.
4 4 *
5 5 * This program is free software; you can redistribute it and/or modify
6 6 * it under the terms of the GNU General Public License version 2 as
... ... @@ -26,7 +26,7 @@
26 26 #define DC_VOLTAGE_MAX 1400000
27 27 #define FREQ_1P2_GHZ 1200000000
28 28 #define FREQ_396_MHZ 396000
29   -#define FREQ_696_MHZ 696000
  29 +#define FREQ_528_MHZ 528000
30 30 #define FREQ_198_MHZ 198000
31 31 #define FREQ_24_MHZ 24000
32 32  
33 33  
... ... @@ -423,10 +423,10 @@
423 423 }
424 424  
425 425 /*
426   - * On i.MX6UL EVK board, if the SOC is run in overide frequency,
  426 + * On i.MX6UL/ULL EVK board, if the SOC is run in overide frequency,
427 427 * the dc_regulator voltage should not be touched.
428 428 */
429   - if (freq_table[num - 1].frequency == FREQ_696_MHZ)
  429 + if (freq_table[num - 1].frequency > FREQ_528_MHZ)
430 430 ignore_dc_reg = true;
431 431 if (!IS_ERR(dc_reg) && !ignore_dc_reg)
432 432 regulator_set_voltage_tol(dc_reg, DC_VOLTAGE_MIN, 0);