clk: tegra: Fix PLL_U post divider and initial rate on Tegra30

commit 797097301860c64b63346d068ba4fe4992bd5021 upstream.

The post divider value in the frequency table is wrong as it would lead
to the PLL producing an output rate of 960 MHz instead of the desired
480 MHz. This wasn't a problem as nothing used the table to actually
initialize the PLL rate, but the bootloader configuration was used
unaltered.

If the bootloader does not set up the PLL it will fail to come when used
under Linux. To fix this don't rely on the bootloader, but set the
correct rate in the clock driver.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
[jonathanh@nvidia.com: Back-ported to stable v4.4.y]
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
index 8c41c6fcb9ee5c953925667c6c1490948d775572..acf83569f86fe7a9305f069028a210e731cb4fd7 100644 (file)
--- a/drivers/clk/tegra/clk-tegra30.c
+++ b/drivers/clk/tegra/clk-tegra30.c
@@ -333,11 +333,11 @@ static struct pdiv_map pllu_p[] = {
 };
 
 static struct tegra_clk_pll_freq_table pll_u_freq_table[] = {
-       { 12000000, 480000000, 960, 12, 0, 12},
-       { 13000000, 480000000, 960, 13, 0, 12},
-       { 16800000, 480000000, 400, 7,  0, 5},
-       { 19200000, 480000000, 200, 4,  0, 3},
-       { 26000000, 480000000, 960, 26, 0, 12},
+       { 12000000, 480000000, 960, 12, 2, 12 },
+       { 13000000, 480000000, 960, 13, 2, 12 },
+       { 16800000, 480000000, 400,  7, 2,  5 },
+       { 19200000, 480000000, 200,  4, 2,  3 },
+       { 26000000, 480000000, 960, 26, 2, 12 },
        { 0, 0, 0, 0, 0, 0 },
 };
 
@@ -1372,6 +1372,7 @@ static struct tegra_clk_init_table init_table[] __initdata = {
        {TEGRA30_CLK_GR2D, TEGRA30_CLK_PLL_C, 300000000, 0},
        {TEGRA30_CLK_GR3D, TEGRA30_CLK_PLL_C, 300000000, 0},
        {TEGRA30_CLK_GR3D2, TEGRA30_CLK_PLL_C, 300000000, 0},
+       { TEGRA30_CLK_PLL_U, TEGRA30_CLK_CLK_MAX, 480000000, 0 },
        {TEGRA30_CLK_CLK_MAX, TEGRA30_CLK_CLK_MAX, 0, 0}, /* This MUST be the last entry. */
 };