1 files changed, 38 insertions, 2 deletions

diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index 6167e73eef9c..1aed6be4de10 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -26,12 +26,44 @@
 #include <asm/mach-au1x00/au1200fb.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>
-#include <asm/mach-db1x00/db1300.h>
 #include <asm/mach-db1x00/bcsr.h>
 #include <asm/mach-au1x00/prom.h>
 
 #include "platform.h"
 
+/* FPGA (external mux) interrupt sources */
+#define DB1300_FIRST_INT        (ALCHEMY_GPIC_INT_LAST + 1)
+#define DB1300_IDE_INT          (DB1300_FIRST_INT + 0)
+#define DB1300_ETH_INT          (DB1300_FIRST_INT + 1)
+#define DB1300_CF_INT           (DB1300_FIRST_INT + 2)
+#define DB1300_VIDEO_INT        (DB1300_FIRST_INT + 4)
+#define DB1300_HDMI_INT         (DB1300_FIRST_INT + 5)
+#define DB1300_DC_INT           (DB1300_FIRST_INT + 6)
+#define DB1300_FLASH_INT        (DB1300_FIRST_INT + 7)
+#define DB1300_CF_INSERT_INT    (DB1300_FIRST_INT + 8)
+#define DB1300_CF_EJECT_INT     (DB1300_FIRST_INT + 9)
+#define DB1300_AC97_INT         (DB1300_FIRST_INT + 10)
+#define DB1300_AC97_PEN_INT     (DB1300_FIRST_INT + 11)
+#define DB1300_SD1_INSERT_INT   (DB1300_FIRST_INT + 12)
+#define DB1300_SD1_EJECT_INT    (DB1300_FIRST_INT + 13)
+#define DB1300_OTG_VBUS_OC_INT  (DB1300_FIRST_INT + 14)
+#define DB1300_HOST_VBUS_OC_INT (DB1300_FIRST_INT + 15)
+#define DB1300_LAST_INT         (DB1300_FIRST_INT + 15)
+
+/* SMSC9210 CS */
+#define DB1300_ETH_PHYS_ADDR    0x19000000
+#define DB1300_ETH_PHYS_END     0x197fffff
+
+/* ATA CS */
+#define DB1300_IDE_PHYS_ADDR    0x18800000
+#define DB1300_IDE_REG_SHIFT    5
+#define DB1300_IDE_PHYS_LEN     (16 << DB1300_IDE_REG_SHIFT)
+
+/* NAND CS */
+#define DB1300_NAND_PHYS_ADDR   0x20000000
+#define DB1300_NAND_PHYS_END    0x20000fff
+
+
 static struct i2c_board_info db1300_i2c_devs[] __initdata = {
         { I2C_BOARD_INFO("wm8731", 0x1b), },    /* I2S audio codec */
         { I2C_BOARD_INFO("ne1619", 0x2d), },    /* adm1025-compat hwmon */
@@ -759,11 +791,15 @@ int __init db1300_board_setup(void)
 {
         unsigned short whoami;
 
-        db1300_gpio_config();
         bcsr_init(DB1300_BCSR_PHYS_ADDR,
                   DB1300_BCSR_PHYS_ADDR + DB1300_BCSR_HEXLED_OFS);
 
         whoami = bcsr_read(BCSR_WHOAMI);
+        if (BCSR_WHOAMI_BOARD(whoami) != BCSR_WHOAMI_DB1300)
+                return -ENODEV;
+
+        db1300_gpio_config();
+
         printk(KERN_INFO "NetLogic DBAu1300 Development Platform.\n\t"
                 "BoardID %d   CPLD Rev %d   DaughtercardID %d\n",
                 BCSR_WHOAMI_BOARD(whoami), BCSR_WHOAMI_CPLD(whoami),