Skip to content

Commit

Permalink
arm64: Invoke the of_platform_populate() at arch_initcall() level
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Catalin Marinas committed May 14, 2013
1 parent 9c413e2 commit c560ecf
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions arch/arm64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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",
Expand Down

0 comments on commit c560ecf

Please sign in to comment.