aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Osipenko <digetx@gmail.com>2019-04-11 17:48:35 -0400
committerStephen Boyd <sboyd@kernel.org>2019-04-25 11:17:20 -0400
commit449c695d97e0842affa44245582e3b7dee272fde (patch)
treea180e8177942daf090d80c358f8ce0a1f1aa5539
parent40db569d6769ffa3864fd1b89616b1a7323568a8 (diff)
clk: tegra124: Remove lock-enable bit from PLLM
According to the Tegra124 TRM documentation, PLLM_MISC2 register doesn't have the lock-enable bit as well as any other PLLM-related register. Hence PLLM re-locking can't be initiated by software. The incorrect bit setting should have been harmless since that bit is undefined according to TRM. Tested-by: Steev Klimaszewski <steev@kali.org> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/tegra/clk-tegra124.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c
index df0018f7bf7e..940592375583 100644
--- a/drivers/clk/tegra/clk-tegra124.c
+++ b/drivers/clk/tegra/clk-tegra124.c
@@ -413,7 +413,6 @@ static struct tegra_clk_pll_params pll_m_params = {
413 .base_reg = PLLM_BASE, 413 .base_reg = PLLM_BASE,
414 .misc_reg = PLLM_MISC, 414 .misc_reg = PLLM_MISC,
415 .lock_mask = PLL_BASE_LOCK, 415 .lock_mask = PLL_BASE_LOCK,
416 .lock_enable_bit_idx = PLL_MISC_LOCK_ENABLE,
417 .lock_delay = 300, 416 .lock_delay = 300,
418 .max_p = 5, 417 .max_p = 5,
419 .pdiv_tohw = pllm_p, 418 .pdiv_tohw = pllm_p,
@@ -421,7 +420,7 @@ static struct tegra_clk_pll_params pll_m_params = {
421 .pmc_divnm_reg = PMC_PLLM_WB0_OVERRIDE, 420 .pmc_divnm_reg = PMC_PLLM_WB0_OVERRIDE,
422 .pmc_divp_reg = PMC_PLLM_WB0_OVERRIDE_2, 421 .pmc_divp_reg = PMC_PLLM_WB0_OVERRIDE_2,
423 .freq_table = pll_m_freq_table, 422 .freq_table = pll_m_freq_table,
424 .flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, 423 .flags = TEGRA_PLL_USE_LOCK,
425}; 424};
426 425
427static struct tegra_clk_pll_freq_table pll_e_freq_table[] = { 426static struct tegra_clk_pll_freq_table pll_e_freq_table[] = {