1 files changed, 22 insertions, 8 deletions

diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index 1181241c5052..67219913f09f 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -66,19 +66,33 @@ static int __init detect_board(void)
 {
         int bid;
 
-        /* try the PB1200 first */
+        /* try the DB1200 first */
+        bcsr_init(DB1200_BCSR_PHYS_ADDR,
+                  DB1200_BCSR_PHYS_ADDR + DB1200_BCSR_HEXLED_OFS);
+        if (BCSR_WHOAMI_DB1200 == BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
+                unsigned short t = bcsr_read(BCSR_HEXLEDS);
+                bcsr_write(BCSR_HEXLEDS, ~t);
+                if (bcsr_read(BCSR_HEXLEDS) != t) {
+                        bcsr_write(BCSR_HEXLEDS, t);
+                        return 0;
+                }
+        }
+
+        /* okay, try the PB1200 then */
         bcsr_init(PB1200_BCSR_PHYS_ADDR,
                   PB1200_BCSR_PHYS_ADDR + PB1200_BCSR_HEXLED_OFS);
         bid = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
         if ((bid == BCSR_WHOAMI_PB1200_DDR1) ||
-            (bid == BCSR_WHOAMI_PB1200_DDR2))
-                return 0;
+            (bid == BCSR_WHOAMI_PB1200_DDR2)) {
+                unsigned short t = bcsr_read(BCSR_HEXLEDS);
+                bcsr_write(BCSR_HEXLEDS, ~t);
+                if (bcsr_read(BCSR_HEXLEDS) != t) {
+                        bcsr_write(BCSR_HEXLEDS, t);
+                        return 0;
+                }
+        }
 
-        /* okay, try the DB1200 then */
-        bcsr_init(DB1200_BCSR_PHYS_ADDR,
-                  DB1200_BCSR_PHYS_ADDR + DB1200_BCSR_HEXLED_OFS);
-        bid = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
-        return bid == BCSR_WHOAMI_DB1200 ? 0 : 1;
+        return 1;       /* it's neither */
 }
 
 void __init board_setup(void)