All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: zynq: Move of_clk_init from clock driver
@ 2014-02-05 14:56 ` Michal Simek
  0 siblings, 0 replies; 6+ messages in thread
From: Michal Simek @ 2014-02-05 14:56 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: monstr, Josh Cartwright, Steffen Trumtrar, Rob Herring,
	Peter Crosthwaite, Russell King, Mike Turquette, Soren Brinkmann,
	Stephen Boyd, Stephen Warren, James Hogan, Felipe Pena,
	linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

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>
---

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


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-02-05 15:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-05 14:56 [PATCH] ARM: zynq: Move of_clk_init from clock driver Michal Simek
2014-02-05 14:56 ` Michal Simek
2014-02-05 15:41 ` Sören Brinkmann
2014-02-05 15:41   ` Sören Brinkmann
2014-02-05 15:52   ` Michal Simek
2014-02-05 15:52     ` Michal Simek

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.