Merge branch 'late/fixes' into fixes

* late/fixes:
  ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
  ARM: ux500: always select ABX500_CORE
  ARM: SIRF: select SMP_ON_UP only on SMP builds
  ARM: SPEAr: conditionalize l2x0 support
  ARM: imx: build CPU suspend code only when needed
  ARM: OMAP: build SMP code only for OMAP4/5
  ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
  ARM: default machine descriptor for multiplatform

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 19 insertions, 1 deletions

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 70f1bdeb241b..5af04f6daa33 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -180,6 +180,13 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
         unsigned long dt_root;
         const char *model;
 
+#ifdef CONFIG_ARCH_MULTIPLATFORM
+        DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
+        MACHINE_END
+
+        mdesc_best = (struct machine_desc *)&__mach_desc_GENERIC_DT;
+#endif
+
         if (!dt_phys)
                 return NULL;
 
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 728007c4a2b7..1522c7ae31b0 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -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);