diff options
author | Yoshinori Sato <ysato@users.sourceforge.jp> | 2015-11-03 12:10:09 -0500 |
---|---|---|
committer | Yoshinori Sato <ysato@users.sourceforge.jp> | 2015-11-11 22:18:25 -0500 |
commit | f639eeb4a60ce39f154753e3a745bd755e0fe084 (patch) | |
tree | 5755dc43f49f7724916764034dc583aed25484c1 | |
parent | 3bc27cdfe989906fb025204c68a6f85b07b3a192 (diff) |
h8300: enable CLKSRC_OF
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
-rw-r--r-- | arch/h8300/Kconfig | 1 | ||||
-rw-r--r-- | arch/h8300/kernel/setup.c | 2 |
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 | |||
16 | select OF_EARLY_FLATTREE | 16 | select OF_EARLY_FLATTREE |
17 | select HAVE_MEMBLOCK | 17 | select HAVE_MEMBLOCK |
18 | select HAVE_DMA_ATTRS | 18 | select HAVE_DMA_ATTRS |
19 | select CLKSRC_OF | ||
19 | 20 | ||
20 | config RWSEM_GENERIC_SPINLOCK | 21 | config RWSEM_GENERIC_SPINLOCK |
21 | def_bool y | 22 | 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 @@ | |||
29 | #include <linux/clk-provider.h> | 29 | #include <linux/clk-provider.h> |
30 | #include <linux/memblock.h> | 30 | #include <linux/memblock.h> |
31 | #include <linux/screen_info.h> | 31 | #include <linux/screen_info.h> |
32 | #include <linux/clocksource.h> | ||
32 | 33 | ||
33 | #include <asm/setup.h> | 34 | #include <asm/setup.h> |
34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
@@ -252,4 +253,5 @@ void __init calibrate_delay(void) | |||
252 | void __init time_init(void) | 253 | void __init time_init(void) |
253 | { | 254 | { |
254 | of_clk_init(NULL); | 255 | of_clk_init(NULL); |
256 | clocksource_probe(); | ||
255 | } | 257 | } |