diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-05-16 23:09:46 (GMT) |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-05-16 23:09:46 (GMT) |
| commit | 3217c038c8527222a1ec01cf965fef57711f03dd (patch) | |
| tree | 459a91d1f9d757b7c13d0469c706144871e09dac /drivers/clk | |
| parent | 409f01395b9afac302b943926466cd8dbca61d0a (diff) | |
| parent | d2c834abe2b39a2d5a6c38ef44de87c97cbb34b4 (diff) | |
| download | linux-3217c038c8527222a1ec01cf965fef57711f03dd.tar.xz | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/tegra/clk-pll.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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, |