aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm64/kernel/setup.c')
-rw-r--r--arch/arm64/kernel/setup.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 7665a9bfdb1e..113db863f832 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -39,6 +39,7 @@
39#include <linux/proc_fs.h> 39#include <linux/proc_fs.h>
40#include <linux/memblock.h> 40#include <linux/memblock.h>
41#include <linux/of_fdt.h> 41#include <linux/of_fdt.h>
42#include <linux/of_platform.h>
42 43
43#include <asm/cputype.h> 44#include <asm/cputype.h>
44#include <asm/elf.h> 45#include <asm/elf.h>
@@ -49,6 +50,7 @@
49#include <asm/tlbflush.h> 50#include <asm/tlbflush.h>
50#include <asm/traps.h> 51#include <asm/traps.h>
51#include <asm/memblock.h> 52#include <asm/memblock.h>
53#include <asm/psci.h>
52 54
53unsigned int processor_id; 55unsigned int processor_id;
54EXPORT_SYMBOL(processor_id); 56EXPORT_SYMBOL(processor_id);
@@ -260,6 +262,8 @@ void __init setup_arch(char **cmdline_p)
260 262
261 unflatten_device_tree(); 263 unflatten_device_tree();
262 264
265 psci_init();
266
263#ifdef CONFIG_SMP 267#ifdef CONFIG_SMP
264 smp_init_cpus(); 268 smp_init_cpus();
265#endif 269#endif
@@ -289,6 +293,13 @@ static int __init topology_init(void)
289} 293}
290subsys_initcall(topology_init); 294subsys_initcall(topology_init);
291 295
296static int __init arm64_device_probe(void)
297{
298 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
299 return 0;
300}
301device_initcall(arm64_device_probe);
302
292static const char *hwcap_str[] = { 303static const char *hwcap_str[] = {
293 "fp", 304 "fp",
294 "asimd", 305 "asimd",