clk: tegra: read correct iddq register in PLL_SS registration
Subsystems (3)
PATCH 1/1 clk: tegra: read correct iddq register in PLL_SS registration
This fixes bug in tegra_clk_register_pllss() which mistakenly assume the iddq register is the PLL base address.
--- drivers/clk/tegra/clk-pll.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/clk/tegra/clk-pll.c +7 -4
@@ -1826,7 +1826,7 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name,struct clk *clk, *parent;struct tegra_clk_pll_freq_table cfg;unsigned long parent_rate; -u32 val; +u32 val, val_iddq;int i;if (!pll_params->div_nmp)
@@ -1874,14 +1874,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); val =pll_readl_base (pll); + val_iddq =readl_relaxed (clk_base + pll_params->iddq_reg);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);kfree (pll);return ERR_PTR (-EINVAL ); } - }else - val |=BIT (pll_params->iddq_bit_idx); + }else { + val_iddq |=BIT (pll_params->iddq_bit_idx); +writel_relaxed (val_iddq, clk_base + pll_params->iddq_reg); + } val &= ~PLLSS_LOCK_OVERRIDE ;pll_writel_base (val, pll);
Signature · 1 line
1.9.1
Quoted 4 lines · Bill Huang
This fixes bug in
tegra_clk_register_pllss()which mistakenly assume the iddq register is the PLL base address.Signed-off-by Bill Huang <[email protected]>
Thanks for the quick fix.
Signature · 3 lines
Benson Leung Software Engineer, Chrom* OS [email protected]
Quoted 22 lines · Bill Huang
This fixes bug in
tegra_clk_register_pllss()which mistakenly assume the iddq register is the PLL base address.Signed-off-by Bill Huang <[email protected]>--- drivers/clk/tegra/clk-pll.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/clk/tegra/clk-pll.c +1
-1@@ -1826,7 +1826,7 @@ struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name,struct clk *clk, *parent;struct tegra_clk_pll_freq_table cfg;unsigned long parent_rate; -u32 val; +u32 val, val_iddq;int i;if (!pll_params->div_nmp)
drivers/clk/tegra/clk-pll.c struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name, · line 1877
Quoted 4 lines
drivers/clk/tegra/clk-pll.c +1
-0@@ -1874,14 +1874,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); val =pll_readl_base (pll); + val_iddq =readl_relaxed (clk_base + pll_params->iddq_reg);
You could/should likely use pll_readl(pll_params->iddq_reg, pll) here.
drivers/clk/tegra/clk-pll.c struct clk *tegra_clk_register_pllss(const char *name, const char *parent_name, · line 1886
Quoted 12 lines
drivers/clk/tegra/clk-pll.c +4
-3if (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);kfree (pll);return ERR_PTR (-EINVAL ); } - }else - val |=BIT (pll_params->iddq_bit_idx); + }else { + val_iddq |=BIT (pll_params->iddq_bit_idx); +writel_relaxed (val_iddq, clk_base + pll_params->iddq_reg);
likewise you can use pll_writel(val_iddq, pll_params->iddq_reg, pll) here.
-rhyland
Signature · 1 line
nvpublic