diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-11-20 02:29:16 -0500 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-11-26 15:43:41 -0500 |
| commit | 6eb583da959cf751eb951cc5ff488dd4e41f1b2f (patch) | |
| tree | 325207f6346699f86906e59479c1a94df102a5c1 | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
ARM: tegra: select correct parent clk for pll_p
For Tegra30, pll_p clk's parent is wrongly specified as clk_m instead of
pll_ref in the tegra30_clk_init_table and this is resulting in a
boot-time warning. This patch fixes this by correcting the clk init
table.
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 0b0a5f556d34..988549a77b69 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c | |||
| @@ -102,7 +102,7 @@ static __initdata struct tegra_clk_init_table tegra20_clk_init_table[] = { | |||
| 102 | static __initdata struct tegra_clk_init_table tegra30_clk_init_table[] = { | 102 | static __initdata struct tegra_clk_init_table tegra30_clk_init_table[] = { |
| 103 | /* name parent rate enabled */ | 103 | /* name parent rate enabled */ |
| 104 | { "clk_m", NULL, 0, true }, | 104 | { "clk_m", NULL, 0, true }, |
| 105 | { "pll_p", "clk_m", 408000000, true }, | 105 | { "pll_p", "pll_ref", 408000000, true }, |
| 106 | { "pll_p_out1", "pll_p", 9600000, true }, | 106 | { "pll_p_out1", "pll_p", 9600000, true }, |
| 107 | { NULL, NULL, 0, 0}, | 107 | { NULL, NULL, 0, 0}, |
| 108 | }; | 108 | }; |
