Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1934ffd0 authored by Peter De Schrijver's avatar Peter De Schrijver Committed by Stephen Boyd
Browse files

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: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-by: default avatarTimo Alho <talho@nvidia.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 3dd065e7

drivers/clk/tegra/clk-tegra210.c

+4 −2
Original line number Diff line number Diff line
@@ -718,8 +718,6 @@ static void plldss_defaults(const char *pll_name, struct tegra_clk_pll *plldss, 
	plldss->params->defaults_set = true;



	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
@@ -758,6 +756,10 @@ static void plldss_defaults(const char *pll_name, struct tegra_clk_pll *plldss, 
				(~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 */

		if (val & PLLDSS_BASE_LOCK_OVERRIDE) {

			val &= ~PLLDSS_BASE_LOCK_OVERRIDE;