summaryrefslogtreecommitdiffstats
path: root/arch/mips/jz4740/time.c
diff options
context:
space:
mode:
authorPaul Burton2015-05-24 17:11:32 +0200
committerRalf Baechle2015-06-21 21:53:11 +0200
commit1f4b840983ffbd7053b5c2219deaf62b4b8a3c12 (patch)
tree47e7a2dbca8b3bec666ef0ad792390231239ad90 /arch/mips/jz4740/time.c
parentMIPS/IRQCHIP: Move Ingenic SoC intc driver to drivers/irqchip (diff)
downloadkernel-qcow2-linux-1f4b840983ffbd7053b5c2219deaf62b4b8a3c12.tar.gz
kernel-qcow2-linux-1f4b840983ffbd7053b5c2219deaf62b4b8a3c12.tar.xz
kernel-qcow2-linux-1f4b840983ffbd7053b5c2219deaf62b4b8a3c12.zip
MIPS: JZ4740: Call jz4740_clock_init earlier
Call jz4740_clock_init before any uses of jz4740_clock_bdata occur. This is in preparation for replacing uses of that struct with calls to clk_get_rate, which will allow the clocks to be migrated towards common clock framework & devicetree. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: Lars-Peter Clausen <lars@metafoo.de> Cc: linux-mips@linux-mips.org Cc: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com> Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10148/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/jz4740/time.c')
-rw-r--r--arch/mips/jz4740/time.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c
index 72b0cecbc17c..78ed7652ef67 100644
--- a/arch/mips/jz4740/time.c
+++ b/arch/mips/jz4740/time.c
@@ -20,6 +20,7 @@
#include <linux/clockchips.h>
#include <linux/sched_clock.h>
+#include <asm/mach-jz4740/clock.h>
#include <asm/mach-jz4740/irq.h>
#include <asm/mach-jz4740/timer.h>
#include <asm/time.h>
@@ -115,6 +116,7 @@ void __init plat_time_init(void)
uint32_t clk_rate;
uint16_t ctrl;
+ jz4740_clock_init();
jz4740_timer_init();
clk_rate = jz4740_clock_bdata.ext_rate >> 4;