iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MLK-11343-02 cpufreq: imx: add more clk used by cpufreq

Browse Source 
This patch adds pll1, pll_bypass and pll1_bypass_src that
will be used in ARM clock switching code.

Signed-off-by: Bai Ping <b51503@freescale.com>
Updated during 4.14 rebase
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
This commit is contained in:
Bai Ping
2015-08-12 21:55:08 +08:00
committed by Jason Liu
parent 0ad9f44dd1
commit e35b155379
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/cpufreq/imx6q-cpufreq.c
View File

@ -31,6 +31,9 @@ static struct clk *step_clk;
static struct clk *pll2_pfd2_396m_clk;
/* clk used by i.MX6UL */
static struct clk *pll1_bypass_clk;
static struct clk *pll1_bypass_src_clk;
static struct clk *pll1_clk;
static struct clk *pll2_bus_clk;
static struct clk *secondary_sel_clk;
@ -218,8 +221,12 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
pll1_sw_clk = clk_get(cpu_dev, "pll1_sw");
step_clk = clk_get(cpu_dev, "step");
pll2_pfd2_396m_clk = clk_get(cpu_dev, "pll2_pfd2_396m");
pll1_clk = clk_get(cpu_dev, "pll1");
pll1_bypass_clk = clk_get(cpu_dev, "pll1_bypass");
pll1_bypass_src_clk = clk_get(cpu_dev, "pll1_bypass_src");
if (IS_ERR(arm_clk) || IS_ERR(pll1_sys_clk) || IS_ERR(pll1_sw_clk) ||
IS_ERR(step_clk) || IS_ERR(pll2_pfd2_396m_clk)) {
IS_ERR(step_clk) || IS_ERR(pll2_pfd2_396m_clk) || IS_ERR(pll1_clk) ||
IS_ERR(pll1_bypass_clk) || IS_ERR(pll1_bypass_src_clk)) {
dev_err(cpu_dev, "failed to get clocks\n");
ret = -ENOENT;
goto put_clk;
@ -389,6 +396,12 @@ put_clk:
clk_put(step_clk);
if (!IS_ERR(pll2_pfd2_396m_clk))
clk_put(pll2_pfd2_396m_clk);
if (!IS_ERR(pll1_clk))
clk_put(pll1_clk);
if (!IS_ERR(pll1_bypass_clk))
clk_put(pll1_bypass_clk);
if (!IS_ERR(pll1_bypass_src_clk))
clk_put(pll1_bypass_src_clk);
if (!IS_ERR(pll2_bus_clk))
clk_put(pll2_bus_clk);
if (!IS_ERR(secondary_sel_clk))