summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2019-06-13 12:12:23 -0400
committerStephen Boyd <sboyd@kernel.org>2019-06-25 19:10:21 -0400
commit20675070127b51c6ca26a895c7e0b459f2c397e1 (patch)
tree2c7b7aafd2971c02da5b8e0c8025f11d2302a4d7
parent0d34dfbf3023cf119b83f6470692c0b10c832495 (diff)
clk: tegra: Do not warn unnecessarily
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> Acked-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/tegra/clk-tegra210.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c
index 1be4d82d78cf..51a21bf1715e 100644
--- a/drivers/clk/tegra/clk-tegra210.c
+++ b/drivers/clk/tegra/clk-tegra210.c
@@ -995,8 +995,6 @@ static void tegra210_pllre_set_defaults(struct tegra_clk_pll *pllre)
995 pllre->params->defaults_set = true; 995 pllre->params->defaults_set = true;
996 996
997 if (val & PLL_ENABLE) { 997 if (val & PLL_ENABLE) {
998 pr_warn("PLL_RE already enabled. Postponing set full defaults\n");
999
1000 /* 998 /*
1001 * PLL is ON: check if defaults already set, then set those 999 * PLL is ON: check if defaults already set, then set those
1002 * that can be updated in flight. 1000 * that can be updated in flight.
@@ -1023,6 +1021,9 @@ static void tegra210_pllre_set_defaults(struct tegra_clk_pll *pllre)
1023 writel_relaxed(val, clk_base + pllre->params->ext_misc_reg[0]); 1021 writel_relaxed(val, clk_base + pllre->params->ext_misc_reg[0]);
1024 udelay(1); 1022 udelay(1);
1025 1023
1024 if (!pllre->params->defaults_set)
1025 pr_warn("PLL_RE already enabled. Postponing set full defaults\n");
1026
1026 return; 1027 return;
1027 } 1028 }
1028 1029