summaryrefslogtreecommitdiffstats
path: root/arch/mips/jz4740/time.c
diff options
context:
space:
mode:
authorPaul Burton2015-05-24 17:11:36 +0200
committerRalf Baechle2015-06-21 21:53:15 +0200
commitff1930c6bdf031e72e101a8aa47d54e73a745f93 (patch)
treef03db06fce068faee8d4878e02b81f7851b43bb9 /arch/mips/jz4740/time.c
parentclk: ingenic: add driver for Ingenic SoC CGU clocks (diff)
downloadkernel-qcow2-linux-ff1930c6bdf031e72e101a8aa47d54e73a745f93.tar.gz
kernel-qcow2-linux-ff1930c6bdf031e72e101a8aa47d54e73a745f93.tar.xz
kernel-qcow2-linux-ff1930c6bdf031e72e101a8aa47d54e73a745f93.zip
MIPS,clk: migrate JZ4740 to common clock framework
Migrate the JZ4740 & the qi_lb60 board to use common clock framework via the new Ingenic SoC CGU driver. Note that the JZ4740-specific debugfs code is removed since common clock framework provides its own debug capabilities. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Co-authored-by: Paul Cercueil <paul@crapouillou.net> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: Lars-Peter Clausen <lars@metafoo.de> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mike Turquette <mturquette@linaro.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: devicetree@vger.kernel.org Cc: linux-clk@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: Fabian Frederick <fabf@skynet.be> Cc: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: linux-kernel@vger.kernel.org Cc: Brian Norris <computersforpeace@gmail.com> Patchwork: https://patchwork.linux-mips.org/patch/10151/ 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 f66f7f5bbe87..be9b0a3a5c40 100644
--- a/arch/mips/jz4740/time.c
+++ b/arch/mips/jz4740/time.c
@@ -14,6 +14,7 @@
*/
#include <linux/clk.h>
+#include <linux/clk-provider.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/time.h>
@@ -118,6 +119,7 @@ void __init plat_time_init(void)
uint16_t ctrl;
struct clk *ext_clk;
+ of_clk_init(NULL);
jz4740_clock_init();
jz4740_timer_init();