1 files changed, 26 insertions, 3 deletions

diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index edc3f8a9d45e..e4eb450de301 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -18,6 +18,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/bridge-regs.h>
+#include <plat/irq.h>
 #include "common.h"
 
 static struct of_device_id kirkwood_dt_match_table[] __initdata = {
@@ -25,6 +26,16 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
         { }
 };
 
+struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
+        OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),
+        OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",
+                       NULL),
+        OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),
+        OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),
+        OF_DEV_AUXDATA("marvell,orion-nand", 0xf4000000, "orion_nand", NULL),
+        {},
+};
+
 static void __init kirkwood_dt_init(void)
 {
         pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
@@ -47,7 +58,6 @@ static void __init kirkwood_dt_init(void)
         kirkwood_clk_init();
 
         /* internal devices that every board has */
-        kirkwood_wdt_init();
         kirkwood_xor0_init();
         kirkwood_xor1_init();
         kirkwood_crypto_init();
@@ -68,7 +78,17 @@ static void __init kirkwood_dt_init(void)
         if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
                 ib62x0_init();
 
-        of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
+        if (of_machine_is_compatible("qnap,ts219"))
+                qnap_dt_ts219_init();
+
+        if (of_machine_is_compatible("seagate,goflexnet"))
+                goflexnet_init();
+
+        if (of_machine_is_compatible("buffalo,lsxl"))
+                lsxl_init();
+
+        of_platform_populate(NULL, kirkwood_dt_match_table,
+                             kirkwood_auxdata_lookup, NULL);
 }
 
 static const char *kirkwood_dt_board_compat[] = {
@@ -77,6 +97,9 @@ static const char *kirkwood_dt_board_compat[] = {
         "dlink,dns-325",
         "iom,iconnect",
         "raidsonic,ib-nas62x0",
+        "qnap,ts219",
+        "seagate,goflexnet",
+        "buffalo,lsxl",
         NULL
 };
 
@@ -84,7 +107,7 @@ DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
         /* Maintainer: Jason Cooper <jason@lakedaemon.net> */
         .map_io         = kirkwood_map_io,
         .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
+        .init_irq       = orion_dt_init_irq,
         .timer          = &kirkwood_timer,
         .init_machine   = kirkwood_dt_init,
         .restart        = kirkwood_restart,