Merge branch 'clk-fixes' into clk-next

3217c038 · Mike Turquette · 409f0139 · d2c834ab · 3217c038
Commit 3217c038 authored May 16, 2014 by Mike Turquette
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/clk/tegra/clk-pll.c drivers/clk/tegra/clk-pll.c +1 -1

No files found.
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -1718,7 +1718,7 @@ struct clk *tegra_clk_register_plle_tegra114(const char *name,
 					"pll_re_vco");
 	} else {
 		val_aux &= ~(PLLE_AUX_PLLRE_SEL | PLLE_AUX_PLLP_SEL);
-		pll_writel(val, pll_params->aux_reg, pll);
+		pll_writel(val_aux, pll_params->aux_reg, pll);
 	}

 	clk = _tegra_clk_register_pll(pll, name, parent_name, flags,