summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorJosh Cartwright <josh.cartwright@ni.com>2012-11-08 12:04:26 -0600
committerMichal Simek <michal.simek@xilinx.com>2012-11-14 16:10:32 +0100
commit0f586fbf6f6a9119392a5cb0f193ac11c753b09e (patch)
tree67557d9ef960e1acb598a5325f079037108c9464 /arch/arm/mach-zynq
parent45aa2c27ada4829bc91bd80455bc67059ac06bc5 (diff)
downloadlinux-0f586fbf6f6a9119392a5cb0f193ac11c753b09e.tar.gz
linux-0f586fbf6f6a9119392a5cb0f193ac11c753b09e.tar.bz2
linux-0f586fbf6f6a9119392a5cb0f193ac11c753b09e.zip
ARM: zynq: use zynq clk bindings
Make the Zynq platform use the newly created zynq clk bindings. Signed-off-by: Josh Cartwright <josh.cartwright@ni.com> Acked-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r--arch/arm/mach-zynq/common.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5441323e2a68..79bf5fb4dad3 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -19,6 +19,8 @@
#include <linux/cpumask.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
+#include <linux/clk/zynq.h>
+#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/of.h>
@@ -96,6 +98,15 @@ static struct map_desc io_desc[] __initdata = {
static void __init xilinx_zynq_timer_init(void)
{
+ struct device_node *np;
+ void __iomem *slcr;
+
+ np = of_find_compatible_node(NULL, NULL, "xlnx,zynq-slcr");
+ slcr = of_iomap(np, 0);
+ WARN_ON(!slcr);
+
+ xilinx_zynq_clocks_init(slcr);
+
xttcpss_timer_init();
}