diff options
author | James Hogan <james.hogan@imgtec.com> | 2013-01-15 10:27:45 -0500 |
---|---|---|
committer | James Hogan <james.hogan@imgtec.com> | 2013-06-13 07:14:06 -0400 |
commit | 8f74f52bb3d8596636614433faa067d73066a724 (patch) | |
tree | 1449428717b50674fc29e303e263f840343a184c | |
parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) |
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 <james.hogan@imgtec.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: devicetree-discuss@lists.ozlabs.org
-rw-r--r-- | arch/metag/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c index 4f5726f1a55b..e18cebb076bf 100644 --- a/arch/metag/kernel/setup.c +++ b/arch/metag/kernel/setup.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/memblock.h> | 20 | #include <linux/memblock.h> |
21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
22 | #include <linux/of_fdt.h> | 22 | #include <linux/of_fdt.h> |
23 | #include <linux/of_platform.h> | ||
23 | #include <linux/pfn.h> | 24 | #include <linux/pfn.h> |
24 | #include <linux/root_dev.h> | 25 | #include <linux/root_dev.h> |
25 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
@@ -424,6 +425,9 @@ static int __init customize_machine(void) | |||
424 | /* customizes platform devices, or adds new ones */ | 425 | /* customizes platform devices, or adds new ones */ |
425 | if (machine_desc->init_machine) | 426 | if (machine_desc->init_machine) |
426 | machine_desc->init_machine(); | 427 | machine_desc->init_machine(); |
428 | else | ||
429 | of_platform_populate(NULL, of_default_bus_match_table, NULL, | ||
430 | NULL); | ||
427 | return 0; | 431 | return 0; |
428 | } | 432 | } |
429 | arch_initcall(customize_machine); | 433 | arch_initcall(customize_machine); |