]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clk: tegra: Do not warn unnecessarily
authorThierry Reding <treding@nvidia.com>
Thu, 13 Jun 2019 16:12:23 +0000 (18:12 +0200)
committerStephen Boyd <sboyd@kernel.org>
Tue, 25 Jun 2019 23:10:21 +0000 (16:10 -0700)
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>
drivers/clk/tegra/clk-tegra210.c

index 1be4d82d78cf7267d06111b70254bf270c554094..51a21bf1715ea9c11ee6906f20b34135791dcd4b 100644 (file)
@@ -995,8 +995,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.
@@ -1023,6 +1021,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;
        }