commit 3217c038c8527222a1ec01cf965fef57711f03dd
author Mike Turquette <mturquette@linaro.org> Fri May 16 16:09:46 2014 -0700
committer Mike Turquette <mturquette@linaro.org> Fri May 16 16:09:46 2014 -0700
tree 459a91d1f9d757b7c13d0469c706144871e09dac
parent 409f01395b9afac302b943926466cd8dbca61d0a
parent d2c834abe2b39a2d5a6c38ef44de87c97cbb34b4

Merge branch 'clk-fixes' into clk-next

drivers/clk/tegra/clk-pll.c

diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 0d20241..e1769ad 100644
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -1718,7 +1718,7 @@
 					"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,