diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-14 11:51:18 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-14 16:44:46 +0200 |
| commit | c560ecfe9617c629ad09b07edb7523c87b2c9619 (patch) | |
| tree | d9d2871a547a671b5d1f0bfa87f100cb7623e27f /arch/arm64 | |
| parent | arm64: debug: clear mdscr_el1 instead of taking the OS lock (diff) | |
| download | linux-c560ecfe9617c629ad09b07edb7523c87b2c9619.tar.xz linux-c560ecfe9617c629ad09b07edb7523c87b2c9619.zip | |
arm64: Invoke the of_platform_populate() at arch_initcall() level
The of_platform_populate() is currently invoked at device_initcall()
level. There are however drivers that use platform_driver_probe()
directly and they need the devices to be populated. This patch makes the
of_platform_populate() and arch_initcall().
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Benoit Lecardonnel <Benoit.Lecardonnel@synopsys.com>
Tested-by: Benoit Lecardonnel <Benoit.Lecardonnel@synopsys.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 6a9a53292590..add6ea616843 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -282,12 +282,13 @@ void __init setup_arch(char **cmdline_p) #endif } -static int __init arm64_of_clk_init(void) +static int __init arm64_device_init(void) { of_clk_init(NULL); + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); return 0; } -arch_initcall(arm64_of_clk_init); +arch_initcall(arm64_device_init); static DEFINE_PER_CPU(struct cpu, cpu_data); @@ -305,13 +306,6 @@ static int __init topology_init(void) } subsys_initcall(topology_init); -static int __init arm64_device_probe(void) -{ - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); - return 0; -} -device_initcall(arm64_device_probe); - static const char *hwcap_str[] = { "fp", "asimd", |