Commit a196d9ee authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  clk: tegra: remove TEGRA_PLL_USE_LOCK for PLLD/PLLD2
parents 8b2bdc76 af7c388a

drivers/clk/tegra/clk-tegra114.c

+2 −2
Original line number Diff line number Diff line
@@ -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[] = {