Merge branch 'clk-fixes' into clk-next

2014-05-16 16:09:46 -07:00 · 2014-05-16 16:09:46 -07:00 · 3217c038c8
commit 3217c038c8
parent 409f01395b d2c834abe2
1 changed files with 1 additions and 1 deletions
--- 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,