diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-08-25 03:49:30 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-08-25 03:49:30 +0300 |
| commit | a196d9ee289afe4ee917c8ff8175f7055dca4626 (patch) | |
| tree | ff315ac6c974a4bc76a396f6275a66d579ef5922 /drivers | |
| parent | 8b2bdc7690bb2ae85b198c065c8f3511180eafef (diff) | |
| parent | af7c388a9c2e5fdd36da6eaaa35fb86fb8aefd0b (diff) | |
| download | linux-a196d9ee289afe4ee917c8ff8175f7055dca4626.tar.xz | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
clk: tegra: remove TEGRA_PLL_USE_LOCK for PLLD/PLLD2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/tegra/clk-tegra114.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c index 64da7b79a6e4..933b5dd698b8 100644 --- a/drivers/clk/tegra/clk-tegra114.c +++ b/drivers/clk/tegra/clk-tegra114.c @@ -428,7 +428,7 @@ static struct tegra_clk_pll_params pll_d_params = { .div_nmp = &pllp_nmp, .freq_table = pll_d_freq_table, .flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_SET_LFCON | - TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, + TEGRA_PLL_HAS_LOCK_ENABLE, }; static struct tegra_clk_pll_params pll_d2_params = { @@ -446,7 +446,7 @@ static struct tegra_clk_pll_params pll_d2_params = { .div_nmp = &pllp_nmp, .freq_table = pll_d_freq_table, .flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_SET_LFCON | - TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, + TEGRA_PLL_HAS_LOCK_ENABLE, }; static const struct pdiv_map pllu_p[] = { |