summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-05-16 16:09:46 -0700
committerMike Turquette <mturquette@linaro.org>2014-05-16 16:09:46 -0700
commit3217c038c8527222a1ec01cf965fef57711f03dd (patch)
tree459a91d1f9d757b7c13d0469c706144871e09dac /drivers/clk
parent409f01395b9afac302b943926466cd8dbca61d0a (diff)
parentd2c834abe2b39a2d5a6c38ef44de87c97cbb34b4 (diff)
downloadblackbird-op-linux-3217c038c8527222a1ec01cf965fef57711f03dd.tar.gz
blackbird-op-linux-3217c038c8527222a1ec01cf965fef57711f03dd.zip
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/tegra/clk-pll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 0d20241e0770..e1769addf435 100644
--- 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,
OpenPOWER on IntegriCloud