evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: zynq: Move of_clk_init from clock driver

Browse source 
Move of_clk_init() from clock driver to enable
options not to use zynq clock driver.
Use for example fixed clock setting.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2014-02-05 15:41:51 +01:00
parent 568800731a
commit 4a32c74e76
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-zynq/common.c
View file

@ -19,6 +19,7 @@
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/clk/zynq.h> #include <linux/clk/zynq.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <linux/of_address.h> #include <linux/of_address.h>
@ -68,6 +69,7 @@ static void __init zynq_timer_init(void)
zynq_early_slcr_init(); zynq_early_slcr_init();
zynq_clock_init(); zynq_clock_init();
of_clk_init(NULL);
clocksource_of_init(); clocksource_of_init();
} }

2
drivers/clk/zynq/clkc.c
View file

@ -602,8 +602,6 @@ void __init zynq_clock_init(void)
of_node_put(slcr); of_node_put(slcr);
of_node_put(np); of_node_put(np);
of_clk_init(NULL);
return; return;
np_err: np_err: