1 files changed, 42 insertions, 8 deletions

diff --git a/arch/arc/plat-arcfpga/platform.c b/arch/arc/plat-arcfpga/platform.c
index b7f63e3f3cae..ac85d6927334 100644
--- a/arch/arc/plat-arcfpga/platform.c
+++ b/arch/arc/plat-arcfpga/platform.c
@@ -18,7 +18,9 @@
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/clk.h>
+#include <asm/mach_desc.h>
 #include <plat/memmap.h>
+#include <plat/smp.h>
 
 /*-----------------------BVCI Latency Unit -----------------------------*/
 
@@ -153,10 +155,7 @@ static void arc_fpga_serial_init(void)
 #endif
 }
 
-/*
- * Early Platform Initialization called from setup_arch()
- */
-void __init arc_platform_early_init(void)
+static void __init plat_fpga_early_init(void)
 {
         pr_info("[plat-arcfpga]: registering early dev resources\n");
 
@@ -172,7 +171,7 @@ static struct of_dev_auxdata plat_auxdata_lookup[] __initdata = {
         {}
 };
 
-int __init fpga_plat_init(void)
+static void __init plat_fpga_populate_dev(void)
 {
         pr_info("[plat-arcfpga]: registering device resources\n");
 
@@ -182,7 +181,42 @@ int __init fpga_plat_init(void)
          */
         of_platform_populate(NULL, of_default_bus_match_table,
                              plat_auxdata_lookup, NULL);
-
-        return 0;
 }
-arch_initcall(fpga_plat_init);
+
+/*----------------------- Machine Descriptions ------------------------------
+ *
+ * Machine description is simply a set of platform/board specific callbacks
+ * This is not directly related to DeviceTree based dynamic device creation,
+ * however as part of early device tree scan, we also select the right
+ * callback set, by matching the DT compatible name.
+ */
+
+static const char *aa4_compat[] __initdata = {
+        "snps,arc-angel4",
+        NULL,
+};
+
+MACHINE_START(ANGEL4, "angel4")
+        .dt_compat      = aa4_compat,
+        .init_early     = plat_fpga_early_init,
+        .init_machine   = plat_fpga_populate_dev,
+        .init_irq       = plat_fpga_init_IRQ,
+#ifdef CONFIG_SMP
+        .init_smp       = iss_model_init_smp,
+#endif
+MACHINE_END
+
+static const char *ml509_compat[] __initdata = {
+        "snps,arc-ml509",
+        NULL,
+};
+
+MACHINE_START(ML509, "ml509")
+        .dt_compat      = ml509_compat,
+        .init_early     = plat_fpga_early_init,
+        .init_machine   = plat_fpga_populate_dev,
+        .init_irq       = plat_fpga_init_IRQ,
+#ifdef CONFIG_SMP
+        .init_smp       = iss_model_init_smp,
+#endif
+MACHINE_END