[PATCH] cpufreq: imx6q: support frequencies >528MHz for i.MX6UL/ULL
From: stefan@agner.ch (Stefan Agner)
Date: 2018-02-11 16:17:37
Also in:
linux-pm, lkml
On 11.02.2018 02:42, Anson Huang wrote:
Anson Huang Best Regards!quoted
-----Original Message----- From: Fabio Estevam [mailto:festevam at gmail.com] Sent: Sunday, February 11, 2018 12:26 AM To: Stefan Agner <stefan@agner.ch>; Anson Huang <redacted> Cc: rjw at rjwysocki.net; viresh kumar <viresh.kumar@linaro.org>; linux-pm at vger.kernel.org; Marcel Ziswiler [off-list ref]; max.oss.09 at gmail.com; linux-kernel [off-list ref]; Octavian Purdila [off-list ref]; Fabio Estevam [off-list ref]; Shawn Guo [off-list ref]; moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE [off-list ref]; dl-linux-imx [off-list ref] Subject: Re: [PATCH] cpufreq: imx6q: support frequencies >528MHz for i.MX6UL/ULL Hi Anson, On Thu, Jan 18, 2018 at 9:58 PM, Stefan Agner [off-list ref] wrote:quoted
Depending on SKU i.MX6UL/i.MX6ULL support frequencies up to 900MHz. Use PLL1 sys clock for all operating points higher than 528MHz. Note: For higher operating points VDD_SOC_IN needs to be 125mV higher than the ARM set-point (see datasheet). Specifically, the i.MX6UL/ULL EVK boards have an external DC regulator which needs adjustment. The regulator adjustment is not covered with this change. Signed-off-by: Stefan Agner <stefan@agner.ch> --- drivers/cpufreq/imx6q-cpufreq.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)diff --git a/drivers/cpufreq/imx6q-cpufreq.cb/drivers/cpufreq/imx6q-cpufreq.c index 628fe899cb48..840f6386c780 100644--- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c@@ -114,12 +114,14 @@ static int imx6q_set_target(struct cpufreq_policy*policy, unsigned int index)quoted
*/ clk_set_rate(arm_clk, (old_freq >> 1) * 1000); clk_set_parent(pll1_sw_clk, pll1_sys_clk); - if (freq_hz > clk_get_rate(pll2_pfd2_396m_clk)) - clk_set_parent(secondary_sel_clk, pll2_bus_clk); - else - clk_set_parent(secondary_sel_clk,pll2_pfd2_396m_clk);quoted
- clk_set_parent(step_clk, secondary_sel_clk); - clk_set_parent(pll1_sw_clk, step_clk); + if (freq_hz <= clk_get_rate(pll2_bus_clk)) { + if (freq_hz > clk_get_rate(pll2_pfd2_396m_clk)) + clk_set_parent(secondary_sel_clk,pll2_bus_clk);quoted
+ else + clk_set_parent(secondary_sel_clk,pll2_pfd2_396m_clk);quoted
+ clk_set_parent(step_clk, secondary_sel_clk); + clk_set_parent(pll1_sw_clk, step_clk); + }For cpufreq > 528MHz, ARM PLL needs to be set_rate, I did NOT see where sets ARM PLL rate?
This is done unconditionally after the if statement:
if (of_machine_is_compatible("fsl,imx6ul") ||
of_machine_is_compatible("fsl,imx6ull")) {
/*
* When changing pll1_sw_clk's parent to pll1_sys_clk,
* CPU may run at higher than 528MHz, this will lead to
* the system unstable if the voltage is lower than the
* voltage of 528MHz, so lower the CPU frequency to one
* half before changing CPU frequency.
*/
clk_set_rate(arm_clk, (old_freq >> 1) * 1000);
clk_set_parent(pll1_sw_clk, pll1_sys_clk);
if (freq_hz <= clk_get_rate(pll2_bus_clk)) {
if (freq_hz > clk_get_rate(pll2_pfd2_396m_clk))
clk_set_parent(secondary_sel_clk, pll2_bus_clk);
else
clk_set_parent(secondary_sel_clk, pll2_pfd2_396m_clk);
clk_set_parent(step_clk, secondary_sel_clk);
clk_set_parent(pll1_sw_clk, step_clk);
}
} else {
clk_set_parent(step_clk, pll2_pfd2_396m_clk);
clk_set_parent(pll1_sw_clk, step_clk);
if (freq_hz > clk_get_rate(pll2_pfd2_396m_clk)) {
clk_set_rate(pll1_sys_clk, new_freq * 1000);
clk_set_parent(pll1_sw_clk, pll1_sys_clk);
} else {
/* pll1_sys needs to be enabled for divider rate change to work. */
pll1_sys_temp_enabled = true;
clk_prepare_enable(pll1_sys_clk);
}
}
/* Ensure the arm clock divider is what we expect */
ret = clk_set_rate(arm_clk, new_freq * 1000);
--
Stefan
Anson.quoted
quoted
} else { clk_set_parent(step_clk, pll2_pfd2_396m_clk); clk_set_parent(pll1_sw_clk, step_clk);Could you please help reviewing this patch? Thanks