From: Santosh Shilimkar Date: Sat, 23 Nov 2013 22:16:52 +0000 (-0500) Subject: ARM: keystone: Avoid calling of_clk_init() twice X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7fef917ba85134552a7cbd4062673a6a5aba00a3;p=linux-beck.git 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 Signed-off-by: Santosh Shilimkar --- 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;