summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshinori Sato <ysato@users.sourceforge.jp>2015-11-04 02:10:09 +0900
committerYoshinori Sato <ysato@users.sourceforge.jp>2015-11-12 12:18:25 +0900
commitf639eeb4a60ce39f154753e3a745bd755e0fe084 (patch)
tree5755dc43f49f7724916764034dc583aed25484c1
parent3bc27cdfe989906fb025204c68a6f85b07b3a192 (diff)
downloadlinux-sh-f639eeb4a60ce39f154753e3a745bd755e0fe084.tar.gz
h8300: enable CLKSRC_OFfor-4.4
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
-rw-r--r--arch/h8300/Kconfig1
-rw-r--r--arch/h8300/kernel/setup.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index db589167838c..dd3ac75776ad 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -16,6 +16,7 @@ config H8300
select OF_EARLY_FLATTREE
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
+ select CLKSRC_OF
config RWSEM_GENERIC_SPINLOCK
def_bool y
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index 0fd1fe65c0b8..c772abe6d19c 100644
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -29,6 +29,7 @@
#include <linux/clk-provider.h>
#include <linux/memblock.h>
#include <linux/screen_info.h>
+#include <linux/clocksource.h>
#include <asm/setup.h>
#include <asm/irq.h>
@@ -252,4 +253,5 @@ void __init calibrate_delay(void)
void __init time_init(void)
{
of_clk_init(NULL);
+ clocksource_probe();
}