Merge branch 'clk-fixes' into clk-next

* clk-fixes: clk: tegra: remove TEGRA_PLL_USE_LOCK for PLLD/PLLD2

Merge branch 'clk-fixes' into clk-next
* clk-fixes: clk: tegra: remove TEGRA_PLL_USE_LOCK for PLLD/PLLD2
a196d9ee · Stephen Boyd · 8b2bdc76 · af7c388a · a196d9ee
Commit a196d9ee authored Aug 24, 2016 by Stephen Boyd
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/clk/tegra/clk-tegra114.c drivers/clk/tegra/clk-tegra114.c +2 -2

No files found.
--- 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[] = {