bump ath9k package version number, too

[openwrt.git] / package / broadcom-diag / src / diag.c

diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index a4bad4d..bbc0bfa 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -61,6 +61,8 @@ enum {
        WRTSL54GS,
        WRT54G3G,
        WRT350N,
+       WRT600N,
+       WRT600NV11,
 
        /* ASUS */
        WLHDD,
@@ -142,9 +144,12 @@ static void __init bcm4780_init(void) {
 static void __init bcm57xx_init(void) {
        int pin = 1 << 2;
 
+#ifndef LINUX_2_4
+       /* FIXME: switch comes up, but port mappings/vlans not right */
        gpio_outen(pin, pin);
        gpio_control(pin, 0);
        gpio_out(pin, pin);
+#endif
 }
 
 static struct platform_t __initdata platforms[] = {
@@ -237,6 +242,38 @@ static struct platform_t __initdata platforms[] = {
                },
                .platform_init = bcm57xx_init,
        },
+       [WRT600N] = {
+               .name           = "Linksys WRT600N",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 7 },
+               },
+               .leds           = {
+                       { .name = "power",              .gpio = 1 << 2,  .polarity = REVERSE }, // Power LED
+                       { .name = "usb",                .gpio = 1 << 3,  .polarity = REVERSE }, // USB LED
+                       { .name = "wl0_ses_amber",      .gpio = 1 << 8,  .polarity = REVERSE }, // 2.4Ghz LED Amber
+                       { .name = "wl0_ses_green",      .gpio = 1 << 9,  .polarity = REVERSE }, // 2.4Ghz LED Green
+                       { .name = "wl1_ses_amber",      .gpio = 1 << 10, .polarity = REVERSE }, // 5.6Ghz LED Amber
+                       { .name = "wl1_ses_green",      .gpio = 1 << 11, .polarity = REVERSE }, // 5.6Ghz LED Green
+               },
+               .platform_init = bcm57xx_init,
+       },
+       [WRT600NV11] = {
+               .name           = "Linksys WRT600N V1.1",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 7 },
+               },
+               .leds           = {
+                       { .name = "power",             .gpio = 1 << 2,  .polarity = REVERSE }, // Power LED
+                       { .name = "usb",                .gpio = 1 << 3,  .polarity = REVERSE }, // USB LED
+                       { .name = "wl0_ses_amber",      .gpio = 1 << 8,  .polarity = REVERSE }, // 2.4Ghz LED Amber
+                       { .name = "wl0_ses_green",     .gpio = 1 << 9,  .polarity = REVERSE }, // 2.4Ghz LED Green
+                       { .name = "wl1_ses_amber",      .gpio = 1 << 10, .polarity = REVERSE }, // 5.6Ghz LED Amber
+                       { .name = "wl1_ses_green",      .gpio = 1 << 11, .polarity = REVERSE }, // 5.6Ghz LED Green
+               },
+               .platform_init = bcm57xx_init,
+       },
        /* Asus */
        [WLHDD] = {
                .name           = "ASUS WL-HDD",
@@ -743,6 +780,14 @@ static struct platform_t __init *platform_detect(void)
        boardnum = getvar("boardnum");
        boardtype = getvar("boardtype");
 
+       if (!strcmp(boardnum, "20070615")) { /* Linksys WRT600N  v1/V1.1 */
+               if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "0") && !strcmp(getvar("switch_type"),"BCM5395"))
+                       return &platforms[WRT600NV11];
+
+       if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "0"))
+                       return &platforms[WRT600N];
+       }
+
        if (startswith(getvar("pmon_ver"), "CFE")) {
                /* CFE based - newer hardware */
                if (!strcmp(boardnum, "42")) { /* Linksys */