merge r16434 to 8.09
authorFlorian Fainelli <florian@openwrt.org>
Sat, 13 Jun 2009 15:57:49 +0000 (15:57 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sat, 13 Jun 2009 15:57:49 +0000 (15:57 +0000)
SVN-Revision: 16435

package/broadcom-diag/src/diag.c

index 341880a..65892da 100644 (file)
@@ -55,6 +55,7 @@ module_param(gpiomask, int, 0644);
 enum {
        /* Linksys */
        WAP54GV1,
+       WAP54GV2,
        WAP54GV3,
        WRT54GV1,
        WRT54G,
@@ -167,6 +168,16 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "wlan",       .gpio = 1 << 4 },
                },
        },
+       [WAP54GV2] = {
+               .name           = "Linksys WAP54G V2",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 0 },
+               },
+               .leds           = {
+                       { .name = "wlan",       .gpio = 1 << 5, .polarity = REVERSE },
+                       /* GPIO 6 is b44 (eth0, LAN) PHY power */
+               },
+       },
        [WAP54GV3] = {
                .name           = "Linksys WAP54G V3",
                .buttons        = {
@@ -838,6 +849,8 @@ static struct platform_t __init *platform_detect(void)
                        /* default to WRT54G */
                        return &platforms[WRT54G];
                }
+               if (!strcmp(boardnum, "1024") && !strcmp(boardtype, "0x0446"))
+                       return &platforms[WAP54GV2];
 
                if (!strcmp(boardnum, "44") || !strcmp(boardnum, "44\r")) {
                        if (!strcmp(boardtype,"0x0101") || !strcmp(boardtype, "0x0101\r"))