Commit aae92db9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

Pull tegra clock driver fix from Mike Turquette:
 "Missing base address in Tegra clock driver results in non-operational
  PCIe.  On some devices this means that Ethernet will go uninitialized
  and other devices will fail.  This pull request fixes it with a single
  patch to pass the proper base address in the Tegra clock driver."

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: tegra: Allow PLLE training to succeed
parents dc543f9e 0f1bc12e
...@@ -703,7 +703,7 @@ static void tegra20_pll_init(void) ...@@ -703,7 +703,7 @@ static void tegra20_pll_init(void)
clks[pll_a_out0] = clk; clks[pll_a_out0] = clk;
/* PLLE */ /* PLLE */
clk = tegra_clk_register_plle("pll_e", "pll_ref", clk_base, NULL, clk = tegra_clk_register_plle("pll_e", "pll_ref", clk_base, pmc_base,
0, 100000000, &pll_e_params, 0, 100000000, &pll_e_params,
0, pll_e_freq_table, NULL); 0, pll_e_freq_table, NULL);
clk_register_clkdev(clk, "pll_e", NULL); clk_register_clkdev(clk, "pll_e", NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment