|
@@ -18,6 +18,7 @@
|
|
|
#include <linux/bootmem.h>
|
|
|
#include <linux/seq_file.h>
|
|
|
#include <linux/screen_info.h>
|
|
|
+#include <linux/of_platform.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/kexec.h>
|
|
|
#include <linux/of_fdt.h>
|
|
@@ -659,9 +660,19 @@ struct screen_info screen_info = {
|
|
|
|
|
|
static int __init customize_machine(void)
|
|
|
{
|
|
|
- /* customizes platform devices, or adds new ones */
|
|
|
+ /*
|
|
|
+ * customizes platform devices, or adds new ones
|
|
|
+ * On DT based machines, we fall back to populating the
|
|
|
+ * machine from the device tree, if no callback is provided,
|
|
|
+ * otherwise we would always need an init_machine callback.
|
|
|
+ */
|
|
|
if (machine_desc->init_machine)
|
|
|
machine_desc->init_machine();
|
|
|
+#ifdef CONFIG_OF
|
|
|
+ else
|
|
|
+ of_platform_populate(NULL, of_default_bus_match_table,
|
|
|
+ NULL, NULL);
|
|
|
+#endif
|
|
|
return 0;
|
|
|
}
|
|
|
arch_initcall(customize_machine);
|