summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-11-18 16:48:19 +0100
committerMichal Simek <michal.simek@xilinx.com>2014-02-10 11:21:13 +0100
commitb0504e39c27b00101c9c1fa2c58fd896ae0f64f5 (patch)
tree526bfc125e81fbdb37a8391106070be9f5cfec61 /arch/arm/mach-zynq
parent5e2182803497c22d50675f0f3af12bf5305e8716 (diff)
downloadblackbird-op-linux-b0504e39c27b00101c9c1fa2c58fd896ae0f64f5.tar.gz
blackbird-op-linux-b0504e39c27b00101c9c1fa2c58fd896ae0f64f5.zip
ARM: zynq: Map I/O memory on clkc init
The clkc has its registers in the range of the slcr. Instead of passing around the slcr base address pointer, let the clkc get the address from the DT. This prepares the slcr to be a real driver with multiple memory ranges (slcr, clocks, pinctrl,...) Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r--arch/arm/mach-zynq/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 38401cf78383..93ea19b13e6e 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -67,7 +67,7 @@ static void __init zynq_timer_init(void)
{
zynq_early_slcr_init();
- zynq_clock_init(zynq_slcr_base);
+ zynq_clock_init();
clocksource_of_init();
}
OpenPOWER on IntegriCloud