]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
clk: tegra124: Remove lock-enable bit from PLLM
authorDmitry Osipenko <digetx@gmail.com>
Thu, 11 Apr 2019 21:48:35 +0000 (00:48 +0300)
committerStephen Boyd <sboyd@kernel.org>
Thu, 25 Apr 2019 15:17:20 +0000 (08:17 -0700)
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>
drivers/clk/tegra/clk-tegra124.c

index df0018f7bf7ed8668d04a6ab5ef47994b4ef3ac3..940592375583687e3c157e9ddadc2801e716276a 100644 (file)
@@ -413,7 +413,6 @@ static struct tegra_clk_pll_params pll_m_params = {
        .base_reg = PLLM_BASE,
        .misc_reg = PLLM_MISC,
        .lock_mask = PLL_BASE_LOCK,
-       .lock_enable_bit_idx = PLL_MISC_LOCK_ENABLE,
        .lock_delay = 300,
        .max_p = 5,
        .pdiv_tohw = pllm_p,
@@ -421,7 +420,7 @@ static struct tegra_clk_pll_params pll_m_params = {
        .pmc_divnm_reg = PMC_PLLM_WB0_OVERRIDE,
        .pmc_divp_reg = PMC_PLLM_WB0_OVERRIDE_2,
        .freq_table = pll_m_freq_table,
-       .flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE,
+       .flags = TEGRA_PLL_USE_LOCK,
 };
 
 static struct tegra_clk_pll_freq_table pll_e_freq_table[] = {