diff options
author | Peter De Schrijver <pdeschrijver@nvidia.com> | 2017-07-25 06:34:10 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-08-23 18:59:50 -0400 |
commit | 1934ffd08d79ad746dbb1e2fcaeb76950be57be6 (patch) | |
tree | 7375320d73644d156b623c58bc8231d4298ab01a | |
parent | 3dd065e70e6c6ec54d2fc7d5158d88518d3c5ab9 (diff) |
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>
-rw-r--r-- | drivers/clk/tegra/clk-tegra210.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c index a4d7d94b6436..1e470ca154f6 100644 --- a/drivers/clk/tegra/clk-tegra210.c +++ b/drivers/clk/tegra/clk-tegra210.c | |||
@@ -718,8 +718,6 @@ static void plldss_defaults(const char *pll_name, struct tegra_clk_pll *plldss, | |||
718 | plldss->params->defaults_set = true; | 718 | plldss->params->defaults_set = true; |
719 | 719 | ||
720 | if (val & PLL_ENABLE) { | 720 | if (val & PLL_ENABLE) { |
721 | pr_warn("%s already enabled. Postponing set full defaults\n", | ||
722 | pll_name); | ||
723 | 721 | ||
724 | /* | 722 | /* |
725 | * PLL is ON: check if defaults already set, then set those | 723 | * 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, | |||
758 | (~PLLDSS_MISC1_CFG_EN_SDM)); | 756 | (~PLLDSS_MISC1_CFG_EN_SDM)); |
759 | } | 757 | } |
760 | 758 | ||
759 | if (!plldss->params->defaults_set) | ||
760 | pr_warn("%s already enabled. Postponing set full defaults\n", | ||
761 | pll_name); | ||
762 | |||
761 | /* Enable lock detect */ | 763 | /* Enable lock detect */ |
762 | if (val & PLLDSS_BASE_LOCK_OVERRIDE) { | 764 | if (val & PLLDSS_BASE_LOCK_OVERRIDE) { |
763 | val &= ~PLLDSS_BASE_LOCK_OVERRIDE; | 765 | val &= ~PLLDSS_BASE_LOCK_OVERRIDE; |