diff options
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
-rw-r--r-- | arch/microblaze/kernel/setup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 8de8ebc309f1..67cc4b282cc1 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/clk-provider.h> | ||
12 | #include <linux/clocksource.h> | 13 | #include <linux/clocksource.h> |
13 | #include <linux/string.h> | 14 | #include <linux/string.h> |
14 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
@@ -136,7 +137,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
136 | lockdep_init(); | 137 | lockdep_init(); |
137 | 138 | ||
138 | /* initialize device tree for usage in early_printk */ | 139 | /* initialize device tree for usage in early_printk */ |
139 | early_init_devtree((void *)_fdt_start); | 140 | early_init_devtree(_fdt_start); |
140 | 141 | ||
141 | #ifdef CONFIG_EARLY_PRINTK | 142 | #ifdef CONFIG_EARLY_PRINTK |
142 | setup_early_printk(NULL); | 143 | setup_early_printk(NULL); |
@@ -152,8 +153,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
152 | if (fdt) | 153 | if (fdt) |
153 | pr_info("FDT at 0x%08x\n", fdt); | 154 | pr_info("FDT at 0x%08x\n", fdt); |
154 | else | 155 | else |
155 | pr_info("Compiled-in FDT at 0x%08x\n", | 156 | pr_info("Compiled-in FDT at %p\n", _fdt_start); |
156 | (unsigned int)_fdt_start); | ||
157 | 157 | ||
158 | #ifdef CONFIG_MTD_UCLINUX | 158 | #ifdef CONFIG_MTD_UCLINUX |
159 | pr_info("Found romfs @ 0x%08x (0x%08x)\n", | 159 | pr_info("Found romfs @ 0x%08x (0x%08x)\n", |
@@ -175,7 +175,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
175 | #else | 175 | #else |
176 | if (!msr) { | 176 | if (!msr) { |
177 | pr_info("!!!Your kernel not setup MSR instruction but "); | 177 | pr_info("!!!Your kernel not setup MSR instruction but "); |
178 | pr_cont"CPU have it %x\n", msr); | 178 | pr_cont("CPU have it %x\n", msr); |
179 | } | 179 | } |
180 | #endif | 180 | #endif |
181 | 181 | ||
@@ -196,6 +196,8 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
196 | 196 | ||
197 | void __init time_init(void) | 197 | void __init time_init(void) |
198 | { | 198 | { |
199 | of_clk_init(NULL); | ||
200 | setup_cpuinfo_clk(); | ||
199 | clocksource_of_init(); | 201 | clocksource_of_init(); |
200 | } | 202 | } |
201 | 203 | ||