提交 2d7f61f3 编写于 作者: B Bill Huang 提交者: Thierry Reding

clk: tegra: Read correct IDDQ register in PLL_SS registration

This fixes a bug in tegra_clk_register_pllss() which mistakenly assume
the IDDQ register is the PLL base address.
Signed-off-by: NBill Huang <bilhuang@nvidia.com>
Reviewed-by: NBenson Leung <bleung@chromium.org>
Signed-off-by: NRhyland Klein <rklein@nvidia.com>
Signed-off-by: NThierry Reding <treding@nvidia.com>
上级 a4ca2b2f
...@@ -1934,7 +1934,7 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name, ...@@ -1934,7 +1934,7 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name,
struct clk *clk, *parent; struct clk *clk, *parent;
struct tegra_clk_pll_freq_table cfg; struct tegra_clk_pll_freq_table cfg;
unsigned long parent_rate; unsigned long parent_rate;
u32 val; u32 val, val_iddq;
int i; int i;
if (!pll_params->div_nmp) if (!pll_params->div_nmp)
...@@ -1981,14 +1981,17 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name, ...@@ -1981,14 +1981,17 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name,
pll_writel(PLLSS_CTRL1_DEFAULT, pll_params->ext_misc_reg[2], pll); pll_writel(PLLSS_CTRL1_DEFAULT, pll_params->ext_misc_reg[2], pll);
val = pll_readl_base(pll); val = pll_readl_base(pll);
val_iddq = readl_relaxed(clk_base + pll_params->iddq_reg);
if (val & PLL_BASE_ENABLE) { if (val & PLL_BASE_ENABLE) {
if (val & BIT(pll_params->iddq_bit_idx)) { if (val_iddq & BIT(pll_params->iddq_bit_idx)) {
WARN(1, "%s is on but IDDQ set\n", name); WARN(1, "%s is on but IDDQ set\n", name);
kfree(pll); kfree(pll);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
} else } else {
val |= BIT(pll_params->iddq_bit_idx); val_iddq |= BIT(pll_params->iddq_bit_idx);
writel_relaxed(val_iddq, clk_base + pll_params->iddq_reg);
}
val &= ~PLLSS_LOCK_OVERRIDE; val &= ~PLLSS_LOCK_OVERRIDE;
pll_writel_base(val, pll); pll_writel_base(val, pll);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册