[ar71xx] use enum for the machine type

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / prom.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index 03b03047e054e9dda1b6d77e0124b4b75e8bcfcd..6907be8ee9d79b49c59ca4c3bddecdb57e847783 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -19,11 +19,12 @@
 #include <asm/fw/myloader/myloader.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 struct board_rec {
-       char            *name;
-       unsigned long   mach_type;
+       char                    *name;
+       enum ar71xx_mach_type   mach_type;
 };
 
 static int ar71xx_prom_argc __initdata;
@@ -44,26 +45,50 @@ static struct board_rec boards[] __initdata = {
                .name           = "493",
                .mach_type      = AR71XX_MACH_RB_493,
        }, {
-               .name           = "AW-NR580",
-               .mach_type      = AR71XX_MACH_AW_NR580,
+               .name           = "AP81",
+               .mach_type      = AR71XX_MACH_AP81,
        }, {
                .name           = "AP83",
                .mach_type      = AR71XX_MACH_AP83,
+       }, {
+               .name           = "AW-NR580",
+               .mach_type      = AR71XX_MACH_AW_NR580,
        }, {
                .name           = "TEW-632BRP",
                .mach_type      = AR71XX_MACH_TEW_632BRP,
+       }, {
+               .name           = "TL-WR941ND",
+               .mach_type      = AR71XX_MACH_TL_WR941ND,
        }, {
                .name           = "UBNT-RS",
                .mach_type      = AR71XX_MACH_UBNT_RS,
+       }, {
+               .name           = "UBNT-RSPRO",
+               .mach_type      = AR71XX_MACH_UBNT_RSPRO,
+       }, {
+               .name           = "Ubiquiti AR71xx-based board",
+               .mach_type      = AR71XX_MACH_UBNT_RS,
+       }, {
+               .name           = "UBNT-LS-SR71",
+               .mach_type      = AR71XX_MACH_UBNT_LSSR71,
        }, {
                .name           = "UBNT-LSX",
                .mach_type      = AR71XX_MACH_UBNT_LSX,
        }, {
                .name           = "WNR2000",
                .mach_type      = AR71XX_MACH_WNR2000,
+       }, {
+               .name           = "WRT160NL",
+               .mach_type      = AR71XX_MACH_WRT160NL,
+       }, {
+               .name           = "WRT400N",
+               .mach_type      = AR71XX_MACH_WRT400N,
        }, {
                .name           = "PB42",
                .mach_type      = AR71XX_MACH_PB42,
+       }, {
+               .name           = "PB44",
+               .mach_type      = AR71XX_MACH_PB44,
        }, {
                .name           = "MZK-W300NH",
                .mach_type      = AR71XX_MACH_MZK_W300NH,
@@ -149,7 +174,7 @@ static int ar71xx_prom_init_myloader(void)
 
        switch (mylo->did) {
        case DEVID_COMPEX_WP543:
-               ar71xx_mach_type = AR71XX_MACH_WP543;
+               ar71xx_mach = AR71XX_MACH_WP543;
                break;
        default:
                printk(KERN_WARNING "prom: unknown device id: %x\n",
@@ -172,7 +197,7 @@ static void ar71xx_prom_init_generic(void)
        if (!p)
                p = ar71xx_prom_getenv("board");
        if (p)
-               ar71xx_mach_type = find_board_byname(p);
+               ar71xx_mach = find_board_byname(p);
 
        p = ar71xx_prom_getenv("ethaddr");
        if (!p)
@@ -188,7 +213,7 @@ void __init prom_init(void)
                        (unsigned int)fw_arg0, (unsigned int)fw_arg1,
                        (unsigned int)fw_arg2, (unsigned int)fw_arg3);
 
-       ar71xx_mach_type = AR71XX_MACH_GENERIC;
+       ar71xx_mach = AR71XX_MACH_GENERIC;
 
        if (ar71xx_prom_init_myloader())
                return;