Skip to content

L
linux
Commit 14050118 authored by Rhyland Klein's avatar Rhyland Klein Committed by Thierry Reding
Browse files
Options

clk: tegra: Remove improper flags for lock_enable 

Most PLL's don't actually have LOCK_ENABLE bits. However, most PLL's
also had that flag set, which meant that the clk code was trying to
enable locks, and inadvertantly flipping bits in other fields.

For PLLM, ensure the correct register is used for the misc_register.
PLL_MISC0 contains the EN_LCKDET bit which should be used for enabling
the lock, and PLLM_MISC1 shouldn't be used at all.

Lastly, remove some of the settings which would point to the EN_LCKDET
bits for some PLLs. There is no need to enable the locks, and that is
done as part of the set_defaults logic already.
Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 21e49032
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 28 deletions
drivers/clk/tegra/clk-tegra210.c
View file @ 14050118
...@@ -1386,7 +1386,7 @@ static struct tegra_clk_pll_params pll_c_params = { ...@@ -1386,7 +1386,7 @@ static struct tegra_clk_pll_params pll_c_params = {
.mdiv_default = 3, .mdiv_default = 3,
.div_nmp = &pllc_nmp, .div_nmp = &pllc_nmp,
.freq_table = pll_cx_freq_table, .freq_table = pll_cx_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.set_defaults = _pllc_set_defaults, .set_defaults = _pllc_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1425,7 +1425,7 @@ static struct tegra_clk_pll_params pll_c2_params = { ...@@ -1425,7 +1425,7 @@ static struct tegra_clk_pll_params pll_c2_params = {
.ext_misc_reg[2] = PLLC2_MISC2, .ext_misc_reg[2] = PLLC2_MISC2,
.ext_misc_reg[3] = PLLC2_MISC3, .ext_misc_reg[3] = PLLC2_MISC3,
.freq_table = pll_cx_freq_table, .freq_table = pll_cx_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.set_defaults = _pllc2_set_defaults, .set_defaults = _pllc2_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1455,7 +1455,7 @@ static struct tegra_clk_pll_params pll_c3_params = { ...@@ -1455,7 +1455,7 @@ static struct tegra_clk_pll_params pll_c3_params = {
.ext_misc_reg[2] = PLLC3_MISC2, .ext_misc_reg[2] = PLLC3_MISC2,
.ext_misc_reg[3] = PLLC3_MISC3, .ext_misc_reg[3] = PLLC3_MISC3,
.freq_table = pll_cx_freq_table, .freq_table = pll_cx_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.set_defaults = _pllc3_set_defaults, .set_defaults = _pllc3_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1505,7 +1505,6 @@ static struct tegra_clk_pll_params pll_c4_vco_params = { ...@@ -1505,7 +1505,6 @@ static struct tegra_clk_pll_params pll_c4_vco_params = {
.base_reg = PLLC4_BASE, .base_reg = PLLC4_BASE,
.misc_reg = PLLC4_MISC0, .misc_reg = PLLC4_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLSS_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
.max_p = PLL_QLIN_PDIV_MAX, .max_p = PLL_QLIN_PDIV_MAX,
.ext_misc_reg[0] = PLLC4_MISC0, .ext_misc_reg[0] = PLLC4_MISC0,
...@@ -1517,8 +1516,7 @@ static struct tegra_clk_pll_params pll_c4_vco_params = { ...@@ -1517,8 +1516,7 @@ static struct tegra_clk_pll_params pll_c4_vco_params = {
.div_nmp = &pllss_nmp, .div_nmp = &pllss_nmp,
.freq_table = pll_c4_vco_freq_table, .freq_table = pll_c4_vco_freq_table,
.set_defaults = tegra210_pllc4_set_defaults, .set_defaults = tegra210_pllc4_set_defaults,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE | .flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_VCO_OUT,
TEGRA_PLL_VCO_OUT,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1559,7 +1557,7 @@ static struct tegra_clk_pll_params pll_m_params = { ...@@ -1559,7 +1557,7 @@ static struct tegra_clk_pll_params pll_m_params = {
.vco_min = 800000000, .vco_min = 800000000,
.vco_max = 1866000000, .vco_max = 1866000000,
.base_reg = PLLM_BASE, .base_reg = PLLM_BASE,
.misc_reg = PLLM_MISC1, .misc_reg = PLLM_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLM_MISC_LOCK_ENABLE, .lock_enable_bit_idx = PLLM_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
...@@ -1588,7 +1586,6 @@ static struct tegra_clk_pll_params pll_mb_params = { ...@@ -1588,7 +1586,6 @@ static struct tegra_clk_pll_params pll_mb_params = {
.base_reg = PLLMB_BASE, .base_reg = PLLMB_BASE,
.misc_reg = PLLMB_MISC0, .misc_reg = PLLMB_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLMB_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
.iddq_reg = PLLMB_MISC0, .iddq_reg = PLLMB_MISC0,
.iddq_bit_idx = PLLMB_IDDQ_BIT, .iddq_bit_idx = PLLMB_IDDQ_BIT,
...@@ -1598,7 +1595,7 @@ static struct tegra_clk_pll_params pll_mb_params = { ...@@ -1598,7 +1595,7 @@ static struct tegra_clk_pll_params pll_mb_params = {
.pdiv_tohw = pll_qlin_pdiv_to_hw, .pdiv_tohw = pll_qlin_pdiv_to_hw,
.div_nmp = &pllm_nmp, .div_nmp = &pllm_nmp,
.freq_table = pll_m_freq_table, .freq_table = pll_m_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.set_defaults = tegra210_pllmb_set_defaults, .set_defaults = tegra210_pllmb_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1671,7 +1668,6 @@ static struct tegra_clk_pll_params pll_re_vco_params = { ...@@ -1671,7 +1668,6 @@ static struct tegra_clk_pll_params pll_re_vco_params = {
.base_reg = PLLRE_BASE, .base_reg = PLLRE_BASE,
.misc_reg = PLLRE_MISC0, .misc_reg = PLLRE_MISC0,
.lock_mask = PLLRE_MISC_LOCK, .lock_mask = PLLRE_MISC_LOCK,
.lock_enable_bit_idx = PLLRE_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
.max_p = PLL_QLIN_PDIV_MAX, .max_p = PLL_QLIN_PDIV_MAX,
.ext_misc_reg[0] = PLLRE_MISC0, .ext_misc_reg[0] = PLLRE_MISC0,
...@@ -1681,8 +1677,7 @@ static struct tegra_clk_pll_params pll_re_vco_params = { ...@@ -1681,8 +1677,7 @@ static struct tegra_clk_pll_params pll_re_vco_params = {
.pdiv_tohw = pll_qlin_pdiv_to_hw, .pdiv_tohw = pll_qlin_pdiv_to_hw,
.div_nmp = &pllre_nmp, .div_nmp = &pllre_nmp,
.freq_table = pll_re_vco_freq_table, .freq_table = pll_re_vco_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_LOCK_MISC | .flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_LOCK_MISC | TEGRA_PLL_VCO_OUT,
TEGRA_PLL_HAS_LOCK_ENABLE | TEGRA_PLL_VCO_OUT,
.set_defaults = tegra210_pllre_set_defaults, .set_defaults = tegra210_pllre_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1712,7 +1707,6 @@ static struct tegra_clk_pll_params pll_p_params = { ...@@ -1712,7 +1707,6 @@ static struct tegra_clk_pll_params pll_p_params = {
.base_reg = PLLP_BASE, .base_reg = PLLP_BASE,
.misc_reg = PLLP_MISC0, .misc_reg = PLLP_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLP_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
.iddq_reg = PLLP_MISC0, .iddq_reg = PLLP_MISC0,
.iddq_bit_idx = PLLXP_IDDQ_BIT, .iddq_bit_idx = PLLXP_IDDQ_BIT,
...@@ -1721,8 +1715,7 @@ static struct tegra_clk_pll_params pll_p_params = { ...@@ -1721,8 +1715,7 @@ static struct tegra_clk_pll_params pll_p_params = {
.div_nmp = &pllp_nmp, .div_nmp = &pllp_nmp,
.freq_table = pll_p_freq_table, .freq_table = pll_p_freq_table,
.fixed_rate = 408000000, .fixed_rate = 408000000,
.flags = TEGRA_PLL_FIXED | TEGRA_PLL_USE_LOCK | .flags = TEGRA_PLL_FIXED | TEGRA_PLL_USE_LOCK | TEGRA_PLL_VCO_OUT,
TEGRA_PLL_HAS_LOCK_ENABLE | TEGRA_PLL_VCO_OUT,
.set_defaults = tegra210_pllp_set_defaults, .set_defaults = tegra210_pllp_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1750,7 +1743,7 @@ static struct tegra_clk_pll_params pll_a1_params = { ...@@ -1750,7 +1743,7 @@ static struct tegra_clk_pll_params pll_a1_params = {
.ext_misc_reg[2] = PLLA1_MISC2, .ext_misc_reg[2] = PLLA1_MISC2,
.ext_misc_reg[3] = PLLA1_MISC3, .ext_misc_reg[3] = PLLA1_MISC3,
.freq_table = pll_cx_freq_table, .freq_table = pll_cx_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.set_defaults = _plla1_set_defaults, .set_defaults = _plla1_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
...@@ -1787,7 +1780,6 @@ static struct tegra_clk_pll_params pll_a_params = { ...@@ -1787,7 +1780,6 @@ static struct tegra_clk_pll_params pll_a_params = {
.base_reg = PLLA_BASE, .base_reg = PLLA_BASE,
.misc_reg = PLLA_MISC0, .misc_reg = PLLA_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLA_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
.round_p_to_pdiv = pll_qlin_p_to_pdiv, .round_p_to_pdiv = pll_qlin_p_to_pdiv,
.pdiv_tohw = pll_qlin_pdiv_to_hw, .pdiv_tohw = pll_qlin_pdiv_to_hw,
...@@ -1802,8 +1794,7 @@ static struct tegra_clk_pll_params pll_a_params = { ...@@ -1802,8 +1794,7 @@ static struct tegra_clk_pll_params pll_a_params = {
.ext_misc_reg[1] = PLLA_MISC1, .ext_misc_reg[1] = PLLA_MISC1,
.ext_misc_reg[2] = PLLA_MISC2, .ext_misc_reg[2] = PLLA_MISC2,
.freq_table = pll_a_freq_table, .freq_table = pll_a_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_MDIV_NEW | .flags = TEGRA_PLL_USE_LOCK | TEGRA_MDIV_NEW,
TEGRA_PLL_HAS_LOCK_ENABLE,
.set_defaults = tegra210_plla_set_defaults, .set_defaults = tegra210_plla_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
.set_gain = tegra210_clk_pll_set_gain, .set_gain = tegra210_clk_pll_set_gain,
...@@ -1836,7 +1827,6 @@ static struct tegra_clk_pll_params pll_d_params = { ...@@ -1836,7 +1827,6 @@ static struct tegra_clk_pll_params pll_d_params = {
.base_reg = PLLD_BASE, .base_reg = PLLD_BASE,
.misc_reg = PLLD_MISC0, .misc_reg = PLLD_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLD_MISC_LOCK_ENABLE,
.lock_delay = 1000, .lock_delay = 1000,
.iddq_reg = PLLD_MISC0, .iddq_reg = PLLD_MISC0,
.iddq_bit_idx = PLLD_IDDQ_BIT, .iddq_bit_idx = PLLD_IDDQ_BIT,
...@@ -1850,7 +1840,7 @@ static struct tegra_clk_pll_params pll_d_params = { ...@@ -1850,7 +1840,7 @@ static struct tegra_clk_pll_params pll_d_params = {
.ext_misc_reg[0] = PLLD_MISC0, .ext_misc_reg[0] = PLLD_MISC0,
.ext_misc_reg[1] = PLLD_MISC1, .ext_misc_reg[1] = PLLD_MISC1,
.freq_table = pll_d_freq_table, .freq_table = pll_d_freq_table,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.mdiv_default = 1, .mdiv_default = 1,
.set_defaults = tegra210_plld_set_defaults, .set_defaults = tegra210_plld_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
...@@ -1876,7 +1866,6 @@ static struct tegra_clk_pll_params pll_d2_params = { ...@@ -1876,7 +1866,6 @@ static struct tegra_clk_pll_params pll_d2_params = {
.base_reg = PLLD2_BASE, .base_reg = PLLD2_BASE,
.misc_reg = PLLD2_MISC0, .misc_reg = PLLD2_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLSS_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
.iddq_reg = PLLD2_BASE, .iddq_reg = PLLD2_BASE,
.iddq_bit_idx = PLLSS_IDDQ_BIT, .iddq_bit_idx = PLLSS_IDDQ_BIT,
...@@ -1897,7 +1886,7 @@ static struct tegra_clk_pll_params pll_d2_params = { ...@@ -1897,7 +1886,7 @@ static struct tegra_clk_pll_params pll_d2_params = {
.mdiv_default = 1, .mdiv_default = 1,
.freq_table = tegra210_pll_d2_freq_table, .freq_table = tegra210_pll_d2_freq_table,
.set_defaults = tegra210_plld2_set_defaults, .set_defaults = tegra210_plld2_set_defaults,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
.set_gain = tegra210_clk_pll_set_gain, .set_gain = tegra210_clk_pll_set_gain,
.adjust_vco = tegra210_clk_adjust_vco_min, .adjust_vco = tegra210_clk_adjust_vco_min,
...@@ -1920,7 +1909,6 @@ static struct tegra_clk_pll_params pll_dp_params = { ...@@ -1920,7 +1909,6 @@ static struct tegra_clk_pll_params pll_dp_params = {
.base_reg = PLLDP_BASE, .base_reg = PLLDP_BASE,
.misc_reg = PLLDP_MISC, .misc_reg = PLLDP_MISC,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLSS_MISC_LOCK_ENABLE,
.lock_delay = 300, .lock_delay = 300,
.iddq_reg = PLLDP_BASE, .iddq_reg = PLLDP_BASE,
.iddq_bit_idx = PLLSS_IDDQ_BIT, .iddq_bit_idx = PLLSS_IDDQ_BIT,
...@@ -1941,7 +1929,7 @@ static struct tegra_clk_pll_params pll_dp_params = { ...@@ -1941,7 +1929,7 @@ static struct tegra_clk_pll_params pll_dp_params = {
.mdiv_default = 1, .mdiv_default = 1,
.freq_table = pll_dp_freq_table, .freq_table = pll_dp_freq_table,
.set_defaults = tegra210_plldp_set_defaults, .set_defaults = tegra210_plldp_set_defaults,
.flags = TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, .flags = TEGRA_PLL_USE_LOCK,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
.set_gain = tegra210_clk_pll_set_gain, .set_gain = tegra210_clk_pll_set_gain,
.adjust_vco = tegra210_clk_adjust_vco_min, .adjust_vco = tegra210_clk_adjust_vco_min,
...@@ -1973,7 +1961,6 @@ static struct tegra_clk_pll_params pll_u_vco_params = { ...@@ -1973,7 +1961,6 @@ static struct tegra_clk_pll_params pll_u_vco_params = {
.base_reg = PLLU_BASE, .base_reg = PLLU_BASE,
.misc_reg = PLLU_MISC0, .misc_reg = PLLU_MISC0,
.lock_mask = PLL_BASE_LOCK, .lock_mask = PLL_BASE_LOCK,
.lock_enable_bit_idx = PLLU_MISC_LOCK_ENABLE,
.lock_delay = 1000, .lock_delay = 1000,
.iddq_reg = PLLU_MISC0, .iddq_reg = PLLU_MISC0,
.iddq_bit_idx = PLLU_IDDQ_BIT, .iddq_bit_idx = PLLU_IDDQ_BIT,
...@@ -1983,8 +1970,7 @@ static struct tegra_clk_pll_params pll_u_vco_params = { ...@@ -1983,8 +1970,7 @@ static struct tegra_clk_pll_params pll_u_vco_params = {
.pdiv_tohw = pll_qlin_pdiv_to_hw, .pdiv_tohw = pll_qlin_pdiv_to_hw,
.div_nmp = &pllu_nmp, .div_nmp = &pllu_nmp,
.freq_table = pll_u_freq_table, .freq_table = pll_u_freq_table,
.flags = TEGRA_PLLU | TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE | .flags = TEGRA_PLLU | TEGRA_PLL_USE_LOCK | TEGRA_PLL_VCO_OUT,
TEGRA_PLL_VCO_OUT,
.set_defaults = tegra210_pllu_set_defaults, .set_defaults = tegra210_pllu_set_defaults,
.calc_rate = tegra210_pll_fixed_mdiv_cfg, .calc_rate = tegra210_pll_fixed_mdiv_cfg,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7