[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <572af6e4eaaaa1c74ea62364f8fa7ac5834cc754.1391612175.git.michal.simek@xilinx.com>
Date: Wed, 5 Feb 2014 15:56:37 +0100
From: Michal Simek <michal.simek@...inx.com>
To: linux-arm-kernel@...ts.infradead.org
Cc: monstr@...str.eu, Josh Cartwright <josh.cartwright@...com>,
Steffen Trumtrar <s.trumtrar@...gutronix.de>,
Rob Herring <robherring2@...il.com>,
Peter Crosthwaite <peter.crosthwaite@...inx.com>,
Russell King <linux@....linux.org.uk>,
Mike Turquette <mturquette@...aro.org>,
Soren Brinkmann <soren.brinkmann@...inx.com>,
Stephen Boyd <sboyd@...eaurora.org>,
Stephen Warren <swarren@...dia.com>,
James Hogan <james.hogan@...tec.com>,
Felipe Pena <felipensp@...il.com>, linux-kernel@...r.kernel.org
Subject: [PATCH] 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@...inx.com>
---
Based on http://www.spinics.net/lists/arm-kernel/msg298287.html
series
---
arch/arm/mach-zynq/common.c | 1 +
drivers/clk/zynq/clkc.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 93ea19b..8df35f3 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -68,6 +68,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 03052d6..c812b93 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:
--
1.8.2.3
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists