diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-04-02 10:18:44 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-04-04 18:08:34 -0400 |
commit | ce910686f814fe220f4e55ecca5cfdea7082b3de (patch) | |
tree | b9c845106f99ac45c8b29b60fd042301d27af25f /drivers/clk/tegra | |
parent | 4dd59cdd35506b77ed4ebf4bb90347d7653ba585 (diff) |
clk: tegra: Make gr2d and gr3d clocks children of pll_c
By default these clocks are children of pll_m, but in downstream kernels
they are reparented to pll_c. While at it, decrease their frequencies to
300 MHz because the defaults aren't in the specified range.
gr2d can reportedly run at much higher frequencies, but 300 MHz works
and is a more conservative default.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Mike Turquette <mturquette@linaro.org>
Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers/clk/tegra')
-rw-r--r-- | drivers/clk/tegra/clk-tegra20.c | 2 | ||||
-rw-r--r-- | drivers/clk/tegra/clk-tegra30.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c index b92d48be4cc9..f87bd4a8c324 100644 --- a/drivers/clk/tegra/clk-tegra20.c +++ b/drivers/clk/tegra/clk-tegra20.c | |||
@@ -1247,6 +1247,8 @@ static __initdata struct tegra_clk_init_table init_table[] = { | |||
1247 | {host1x, pll_c, 150000000, 0}, | 1247 | {host1x, pll_c, 150000000, 0}, |
1248 | {disp1, pll_p, 600000000, 0}, | 1248 | {disp1, pll_p, 600000000, 0}, |
1249 | {disp2, pll_p, 600000000, 0}, | 1249 | {disp2, pll_p, 600000000, 0}, |
1250 | {gr2d, pll_c, 300000000, 0}, | ||
1251 | {gr3d, pll_c, 300000000, 0}, | ||
1250 | {clk_max, clk_max, 0, 0}, /* This MUST be the last entry */ | 1252 | {clk_max, clk_max, 0, 0}, /* This MUST be the last entry */ |
1251 | }; | 1253 | }; |
1252 | 1254 | ||
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index ba6f51bc9f3b..b8b241de3f4c 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c | |||
@@ -1911,6 +1911,8 @@ static __initdata struct tegra_clk_init_table init_table[] = { | |||
1911 | {disp1, pll_p, 600000000, 0}, | 1911 | {disp1, pll_p, 600000000, 0}, |
1912 | {disp2, pll_p, 600000000, 0}, | 1912 | {disp2, pll_p, 600000000, 0}, |
1913 | {twd, clk_max, 0, 1}, | 1913 | {twd, clk_max, 0, 1}, |
1914 | {gr2d, pll_c, 300000000, 0}, | ||
1915 | {gr3d, pll_c, 300000000, 0}, | ||
1914 | {clk_max, clk_max, 0, 0}, /* This MUST be the last entry. */ | 1916 | {clk_max, clk_max, 0, 0}, /* This MUST be the last entry. */ |
1915 | }; | 1917 | }; |
1916 | 1918 | ||