X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fbroadcom-diag%2Fsrc%2Fdiag.c;h=341880a70ea26bc8db7e179c37efa86d6944aecb;hp=a1ee842f4f71951884c3d52ff6603092959a87e2;hb=f5fba5bc3ccf493289396deaa64a7ce7385d8590;hpb=f027ecb2cf9b1a1c6cab6f5e4a9d99c49bced63c diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c index a1ee842f4f..341880a70e 100644 --- a/package/broadcom-diag/src/diag.c +++ b/package/broadcom-diag/src/diag.c @@ -61,10 +61,14 @@ enum { WRTSL54GS, WRT54G3G, WRT350N, + WRT600N, + WRT600NV11, /* ASUS */ WLHDD, WL300G, + WL320GE, + WL330GE, WL500G, WL500GD, WL500GP, @@ -97,6 +101,7 @@ enum { /* Dell */ TM2300, + TM2300V2, /* Motorola */ WE800G, @@ -142,9 +147,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 +245,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", @@ -257,6 +297,26 @@ static struct platform_t __initdata platforms[] = { { .name = "power", .gpio = 1 << 0, .polarity = REVERSE }, }, }, + [WL320GE] = { + .name = "ASUS WL-320gE/WL-320gP", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + }, + .leds = { + { .name = "wlan", .gpio = 1 << 0, .polarity = REVERSE }, + { .name = "power", .gpio = 1 << 2, .polarity = REVERSE }, + { .name = "link", .gpio = 1 << 11, .polarity = REVERSE }, + }, + }, + [WL330GE] = { + .name = "ASUS WL-330gE", + .buttons = { + { .name = "reset", .gpio = 1 << 2 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 0, .polarity = REVERSE }, + }, + }, [WL500G] = { .name = "ASUS WL-500g", .buttons = { @@ -491,7 +551,8 @@ static struct platform_t __initdata platforms[] = { /* No usable buttons */ }, .leds = { - { .name = "dmz", .gpio = 1 << 4, .polarity = REVERSE }, +// { .name = "power", .gpio = 1 << 0 .polarity = REVERSE }, // Usable when retrofitting D26 (?) + { .name = "dmz", .gpio = 1 << 4, .polarity = REVERSE }, // actual name WWW { .name = "wlan", .gpio = 1 << 3, .polarity = REVERSE }, }, }, @@ -502,7 +563,7 @@ static struct platform_t __initdata platforms[] = { }, .leds = { { .name = "power", .gpio = 1 << 5, .polarity = REVERSE }, - { .name = "dmz", .gpio = 1 << 0, .polarity = REVERSE }, + { .name = "dmz", .gpio = 1 << 0, .polarity = REVERSE }, // actual name WWW { .name = "wlan", .gpio = 1 << 3, .polarity = REVERSE }, }, }, @@ -528,6 +589,16 @@ static struct platform_t __initdata platforms[] = { { .name = "power", .gpio = 1 << 7, .polarity = REVERSE }, }, }, + [TM2300V2] = { + .name = "Dell TrueMobile 2300 v2", + .buttons = { + { .name = "reset", .gpio = 1 << 0 }, + }, + .leds = { + { .name = "wlan", .gpio = 1 << 6, .polarity = REVERSE }, + { .name = "power", .gpio = 1 << 7, .polarity = REVERSE }, + }, + }, /* Motorola */ [WE800G] = { .name = "Motorola WE800G", @@ -703,14 +774,16 @@ static struct platform_t __init *platform_detect(void) return &platforms[WL520GC]; if (startswith(buf,"WL520GU-")) /* WL520GU-* */ return &platforms[WL520GU]; + if (startswith(buf,"WL330GE-")) /* WL330GE-* */ + return &platforms[WL330GE]; } /* Based on "ModelId" */ if ((buf = nvram_get("ModelId"))) { if (!strcmp(buf, "WR850GP")) return &platforms[WR850GP]; - if (!strcmp(buf,"WX-5565")) - return &platforms[TM2300]; + if (!strcmp(buf, "WX-5565") && !strcmp(getvar("boardtype"),"bcm94710ap")) + return &platforms[TM2300]; /* Dell TrueMobile 2300 */ if (startswith(buf,"WE800G")) /* WE800G* */ return &platforms[WE800G]; } @@ -742,6 +815,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 */ @@ -758,11 +839,18 @@ static struct platform_t __init *platform_detect(void) return &platforms[WRT54G]; } + if (!strcmp(boardnum, "44") || !strcmp(boardnum, "44\r")) { + if (!strcmp(boardtype,"0x0101") || !strcmp(boardtype, "0x0101\r")) + return &platforms[TM2300V2]; /* Dell TrueMobile 2300 v2 */ + } + if (!strcmp(boardnum, "45")) { /* ASUS */ if (!strcmp(boardtype,"0x042f")) return &platforms[WL500GP]; else if (!strcmp(boardtype,"0x0472")) return &platforms[WL500W]; + else if (!strcmp(boardtype,"0x467")) + return &platforms[WL320GE]; else return &platforms[WL500GD]; } @@ -770,6 +858,9 @@ static struct platform_t __init *platform_detect(void) if (!strcmp(boardnum, "10496")) return &platforms[USR5461]; + if (!strcmp(getvar("boardtype"), "0x0101") && !strcmp(getvar("boardrev"), "0x10")) /* SE505V2 With Modified CFE */ + return &platforms[SE505V2]; + } else { /* PMON based - old stuff */ if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) && (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) { @@ -840,14 +931,14 @@ static void register_buttons(struct button_t *b) gpio_control(platform.button_mask, 0); platform.button_polarity = gpio_in() & platform.button_mask; gpio_intpolarity(platform.button_mask, platform.button_polarity); - gpio_intmask(platform.button_mask, platform.button_mask); + gpio_setintmask(platform.button_mask, platform.button_mask); gpio_set_irqenable(1, button_handler); } static void unregister_buttons(struct button_t *b) { - gpio_intmask(platform.button_mask, 0); + gpio_setintmask(platform.button_mask, 0); gpio_set_irqenable(0, button_handler); } @@ -961,7 +1052,7 @@ static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs) changed &= ~gpio_outen(0, 0); - for (b = platform.buttons; b->name; b++) { + for (b = platform.buttons; b->name; b++) { struct event_t *event; if (!(b->gpio & changed)) continue; @@ -1022,6 +1113,7 @@ static void register_leds(struct led_t *l) gpio_outen(mask, oe_mask); gpio_control(mask, 0); gpio_out(mask, val); + gpio_setintmask(mask, 0); } static void unregister_leds(struct led_t *l)