From 8f74f52bb3d8596636614433faa067d73066a724 Mon Sep 17 00:00:00 2001 From: James Hogan Date: Tue, 15 Jan 2013 15:27:45 +0000 Subject: metag: of_platform_populate from arch generic code If no init_machine callback is provided, call of_platform_populate() instead. This allows a board/SoC that only needs to call of_platform_populate to omit the callback altogether. Signed-off-by: James Hogan Cc: Grant Likely Cc: Rob Herring Cc: Arnd Bergmann Cc: devicetree-discuss@lists.ozlabs.org diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c index 4f5726f..e18cebb 100644 --- a/arch/metag/kernel/setup.c +++ b/arch/metag/kernel/setup.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -424,6 +425,9 @@ static int __init customize_machine(void) /* customizes platform devices, or adds new ones */ if (machine_desc->init_machine) machine_desc->init_machine(); + else + of_platform_populate(NULL, of_default_bus_match_table, NULL, + NULL); return 0; } arch_initcall(customize_machine); -- cgit v0.10.2