diff options
author | Josh Cartwright <josh.cartwright@ni.com> | 2012-11-08 13:04:26 -0500 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2012-11-14 10:10:32 -0500 |
commit | 0f586fbf6f6a9119392a5cb0f193ac11c753b09e (patch) | |
tree | 67557d9ef960e1acb598a5325f079037108c9464 /arch/arm/mach-zynq/common.c | |
parent | 45aa2c27ada4829bc91bd80455bc67059ac06bc5 (diff) |
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/common.c')
-rw-r--r-- | arch/arm/mach-zynq/common.c | 11 |
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 @@ | |||
19 | #include <linux/cpumask.h> | 19 | #include <linux/cpumask.h> |
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
22 | #include <linux/clk/zynq.h> | ||
23 | #include <linux/of_address.h> | ||
22 | #include <linux/of_irq.h> | 24 | #include <linux/of_irq.h> |
23 | #include <linux/of_platform.h> | 25 | #include <linux/of_platform.h> |
24 | #include <linux/of.h> | 26 | #include <linux/of.h> |
@@ -96,6 +98,15 @@ static struct map_desc io_desc[] __initdata = { | |||
96 | 98 | ||
97 | static void __init xilinx_zynq_timer_init(void) | 99 | static void __init xilinx_zynq_timer_init(void) |
98 | { | 100 | { |
101 | struct device_node *np; | ||
102 | void __iomem *slcr; | ||
103 | |||
104 | np = of_find_compatible_node(NULL, NULL, "xlnx,zynq-slcr"); | ||
105 | slcr = of_iomap(np, 0); | ||
106 | WARN_ON(!slcr); | ||
107 | |||
108 | xilinx_zynq_clocks_init(slcr); | ||
109 | |||
99 | xttcpss_timer_init(); | 110 | xttcpss_timer_init(); |
100 | } | 111 | } |
101 | 112 | ||