diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-02-05 15:41:51 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-03-17 15:12:07 +0100 |
| commit | 4a32c74e762236a53627536b9b9c1693d3073359 (patch) | |
| tree | 9c3c2b98d3b8d34c6acf03f55219b5f7574817af | |
| parent | 568800731a5b0f6b03d3ee9435b42fecd342454e (diff) | |
| download | blackbird-obmc-linux-4a32c74e762236a53627536b9b9c1693d3073359.tar.gz blackbird-obmc-linux-4a32c74e762236a53627536b9b9c1693d3073359.zip | |
ARM: zynq: Move of_clk_init from clock driver
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>
| -rw-r--r-- | arch/arm/mach-zynq/common.c | 2 | ||||
| -rw-r--r-- | drivers/clk/zynq/clkc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 93ea19b13e6e..5755129a6e47 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -19,6 +19,7 @@ #include <linux/cpumask.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/clk/zynq.h> #include <linux/clocksource.h> #include <linux/of_address.h> @@ -68,6 +69,7 @@ static void __init zynq_timer_init(void) zynq_early_slcr_init(); zynq_clock_init(); + of_clk_init(NULL); clocksource_of_init(); } diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c index 03052d67b197..c812b93a52b2 100644 --- a/drivers/clk/zynq/clkc.c +++ b/drivers/clk/zynq/clkc.c @@ -602,8 +602,6 @@ void __init zynq_clock_init(void) of_node_put(slcr); of_node_put(np); - of_clk_init(NULL); - return; np_err: |
