Changeset 10871

Timestamp:

11/11/08 18:43:02 (5 years ago)

Author:

BrainSlayer

Message:

enhance board detection

Location:

src/linux/ar531x/linux-2.6.23/arch/mips/atheros/ar5315

Files:

• Makefile (modified) (1 diff)
• board.c (modified) (3 diffs)
• irq.c (modified) (1 diff)

src/linux/ar531x/linux-2.6.23/arch/mips/atheros/ar5315/Makefile

@@ -9 +9 @@
 #
 
-obj-y := board.o irq.o
+obj-y := board.o irq.o 

src/linux/ar531x/linux-2.6.23/arch/mips/atheros/ar5315/board.c

@@ -27 +27 @@
 #include <asm/irq.h>
 #include <asm/io.h>
-#include "../ar531x.h"
+#include "ar531x.h"
 
 static int is_5315 = 0;
@@ -196 +196 @@
         bcfg = (struct ar531x_boarddata *) board_config;
 
-#if 0
-        {
-        /* Detect the hardware based on the device ID */
-        u32 devid = sysRegRead(AR5315_SREV) & AR5315_REV_MAJ >> AR5315_REV_MAJ_S;
-                switch(devid) {
-                case 0x9:
-                        mips_machtype = MACH_ATHEROS_AR2317;
-                        break;
-                /* FIXME: how can we detect AR2316? */
-                case 0x8:
-                default:
-                        mips_machtype = MACH_ATHEROS_AR2315;
-                        break;
-                }
-        }
-#endif
 
         config = (struct ar531x_config *) kzalloc(sizeof(struct ar531x_config), GFP_KERNEL);
@@ -343 +327 @@
         add_memory_region(0, memsize, BOOT_MEM_RAM);
 
-        /* Initialize it to AR2315 for now. Real detection will be done
-         * in ar5315_init_devices() */
-        mips_machtype = MACH_ATHEROS_AR2315;
+        /* Detect the hardware based on the device ID */
+        devid = sysRegRead(AR5315_SREV) & AR5315_REV_CHIP;
+        switch(devid) {
+                case 0x90:
+                case 0x91:
+                        mips_machtype = MACH_ATHEROS_AR2317;
+                        break;
+                default:
+                        mips_machtype = MACH_ATHEROS_AR2315;
+                        break;
+        }
 }
 

src/linux/ar531x/linux-2.6.23/arch/mips/atheros/ar5315/irq.c

@@ -24 +24 @@
 #include <asm/irq_cpu.h>
 #include <asm/io.h>
-#include "../ar531x.h"
+#include "ar531x.h"
 
 static u32 gpiointmask = 0, gpiointval = 0;