| Message ID | 20190613161225.2531-1-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/3] clk: tegra: Do not warn unnecessarily | expand |
On 13/06/2019 17:12, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > There is no need to warn if the reference PLL is enabled with the > correct defaults. Only warn if the boot values don't match the defaults. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/clk/tegra/clk-tegra210.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c > index e1ba62d2b1a0..4904ac4a75db 100644 > --- a/drivers/clk/tegra/clk-tegra210.c > +++ b/drivers/clk/tegra/clk-tegra210.c > @@ -984,8 +984,6 @@ static void tegra210_pllre_set_defaults(struct tegra_clk_pll *pllre) > pllre->params->defaults_set = true; > > if (val & PLL_ENABLE) { > - pr_warn("PLL_RE already enabled. Postponing set full defaults\n"); > - > /* > * PLL is ON: check if defaults already set, then set those > * that can be updated in flight. > @@ -1012,6 +1010,9 @@ static void tegra210_pllre_set_defaults(struct tegra_clk_pll *pllre) > writel_relaxed(val, clk_base + pllre->params->ext_misc_reg[0]); > udelay(1); > > + if (!pllre->params->defaults_set) > + pr_warn("PLL_RE already enabled. Postponing set full defaults\n"); > + > return; > } Acked-by: Jon Hunter <jonathanh@nvidia.com> Cheers Jon
Quoting Thierry Reding (2019-06-13 09:12:23) > From: Thierry Reding <treding@nvidia.com> > > There is no need to warn if the reference PLL is enabled with the > correct defaults. Only warn if the boot values don't match the defaults. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- Applied to clk-next
diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c index e1ba62d2b1a0..4904ac4a75db 100644 --- a/drivers/clk/tegra/clk-tegra210.c +++ b/drivers/clk/tegra/clk-tegra210.c @@ -984,8 +984,6 @@ static void tegra210_pllre_set_defaults(struct tegra_clk_pll *pllre) pllre->params->defaults_set = true; if (val & PLL_ENABLE) { - pr_warn("PLL_RE already enabled. Postponing set full defaults\n"); - /* * PLL is ON: check if defaults already set, then set those * that can be updated in flight. @@ -1012,6 +1010,9 @@ static void tegra210_pllre_set_defaults(struct tegra_clk_pll *pllre) writel_relaxed(val, clk_base + pllre->params->ext_misc_reg[0]); udelay(1); + if (!pllre->params->defaults_set) + pr_warn("PLL_RE already enabled. Postponing set full defaults\n"); + return; }