diff options
| author | James Hogan <james.hogan@imgtec.com> | 2013-01-15 15:27:45 +0000 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2013-06-13 12:14:06 +0100 |
| commit | 8f74f52bb3d8596636614433faa067d73066a724 (patch) | |
| tree | 1449428717b50674fc29e303e263f840343a184c /arch/metag | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
| download | linux-8f74f52bb3d8596636614433faa067d73066a724.tar.bz2 | |
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
Diffstat (limited to 'arch/metag')
| -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 @@ #include <linux/memblock.h> #include <linux/mm.h> #include <linux/of_fdt.h> +#include <linux/of_platform.h> #include <linux/pfn.h> #include <linux/root_dev.h> #include <linux/sched.h> @@ -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); |