summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2013-11-23 17:16:52 -0500
committerSantosh Shilimkar <santosh.shilimkar@ti.com>2013-12-16 16:03:36 -0500
commit7fef917ba85134552a7cbd4062673a6a5aba00a3 (patch)
tree67e9fd23793baa8e6768760c38f0ca74d9fc1683
parent8308a78db84b047a223c2c753f3cdad77970f81a (diff)
downloadblackbird-op-linux-7fef917ba85134552a7cbd4062673a6a5aba00a3.tar.gz
blackbird-op-linux-7fef917ba85134552a7cbd4062673a6a5aba00a3.zip
ARM: keystone: Avoid calling of_clk_init() twice
With commit 4178bac4f {ARM: call of_clk_init from default time_init handler}, of_clk_init() is always called on machines using default time_init handler. So drop the of_clk_init() from keystone code to avoid below boot errors because of double call. _of_pll_clk_init: error initializing pll mainpllclk _of_pll_clk_init: error initializing pll papllclk _of_pll_clk_init: error initializing pll ddr3apllclk _of_pll_clk_init: error initializing pll ddr3bpllclk _of_pll_clk_init: error initializing pll armpllclk Reported-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
-rw-r--r--arch/arm/mach-keystone/pm_domain.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-keystone/pm_domain.c b/arch/arm/mach-keystone/pm_domain.c
index 065f2e386368..ca79ddac38bc 100644
--- a/arch/arm/mach-keystone/pm_domain.c
+++ b/arch/arm/mach-keystone/pm_domain.c
@@ -74,7 +74,6 @@ int __init keystone_pm_runtime_init(void)
if (!np)
return 0;
- of_clk_init(NULL);
pm_clk_add_notifier(&platform_bus_type, &platform_domain_notifier);
return 0;
OpenPOWER on IntegriCloud