clk: tegra: don't warn for pll_d2 defaults unnecessarily

If the PLL is on, only warn if the defaults are not yet set. Otherwise be
silent.

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-by: Timo Alho <talho@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Peter De Schrijver 2017-07-25 13:34:10 +03:00 committed by Stephen Boyd
parent 3dd065e70e
commit 1934ffd08d
1 changed files with 4 additions and 2 deletions

View File

@ -718,8 +718,6 @@ static void plldss_defaults(const char *pll_name, struct tegra_clk_pll *plldss,
plldss->params->defaults_set = true; plldss->params->defaults_set = true;
if (val & PLL_ENABLE) { if (val & PLL_ENABLE) {
pr_warn("%s already enabled. Postponing set full defaults\n",
pll_name);
/* /*
* PLL is ON: check if defaults already set, then set those * PLL is ON: check if defaults already set, then set those
@ -758,6 +756,10 @@ static void plldss_defaults(const char *pll_name, struct tegra_clk_pll *plldss,
(~PLLDSS_MISC1_CFG_EN_SDM)); (~PLLDSS_MISC1_CFG_EN_SDM));
} }
if (!plldss->params->defaults_set)
pr_warn("%s already enabled. Postponing set full defaults\n",
pll_name);
/* Enable lock detect */ /* Enable lock detect */
if (val & PLLDSS_BASE_LOCK_OVERRIDE) { if (val & PLLDSS_BASE_LOCK_OVERRIDE) {
val &= ~PLLDSS_BASE_LOCK_OVERRIDE; val &= ~PLLDSS_BASE_LOCK_OVERRIDE;