X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbroadcom-diag%2Fsrc%2Fdiag.c;h=774f0cefd019796edbd0023f2b7df4addbb4a7ff;hb=74aa76c08e4937ea827f74fda8797fcc0b9e7373;hp=a4bad4d00c39475d78c3a1f44cdf0b4bf95dfdee;hpb=a49e56b5c3cec64e6cc87af48a1c3bf3091554e7;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c index a4bad4d00c..774f0cefd0 100644 --- a/package/broadcom-diag/src/diag.c +++ b/package/broadcom-diag/src/diag.c @@ -19,7 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id$ */ #include #include @@ -28,20 +27,13 @@ #include #include #include - -#ifndef LINUX_2_4 #include #include #include +#include #include -extern struct sock *uevent_sock; +#include extern u64 uevent_next_seqnum(void); -#else -#include -#define INIT_WORK INIT_TQUEUE -#define schedule_work schedule_task -#define work_struct tq_struct -#endif #include "gpio.h" #include "diag.h" @@ -55,16 +47,31 @@ module_param(gpiomask, int, 0644); enum { /* Linksys */ WAP54GV1, + WAP54GV2, WAP54GV3, WRT54GV1, WRT54G, WRTSL54GS, WRT54G3G, + WRT54G3GV2_VF, + WRT150NV1, + WRT150NV11, + WRT160NV1, + WRT160NV3, + WRT300NV11, WRT350N, + WRT600N, + WRT600NV11, + WRT610N, + WRT610NV2, + E1000V1, + E3000V1, /* ASUS */ WLHDD, WL300G, + WL320GE, + WL330GE, WL500G, WL500GD, WL500GP, @@ -74,6 +81,7 @@ enum { WL520GU, ASUS_4702, WL700GE, + RTN16, /* Buffalo */ WBR2_G54, @@ -97,6 +105,7 @@ enum { /* Dell */ TM2300, + TM2300V2, /* Motorola */ WE800G, @@ -106,9 +115,13 @@ enum { /* Belkin */ BELKIN_UNKNOWN, + BELKIN_F7D4301, /* Netgear */ WGT634U, + WNR834BV1, + WNR834BV2, + WNDR3400V1, /* Trendware */ TEW411BRPP, @@ -118,11 +131,27 @@ enum { /* D-Link */ DIR130, + DIR320, DIR330, DWL3150, /* Sitecom */ WL105B, + + /* Western Digital */ + WDNetCenter, + + /* Askey */ + RT210W, + + /* OvisLink */ + WL1600GL, + + /* Microsoft */ + MN700, + + /* Edimax */ + PS1208MFG, }; static void __init bcm4780_init(void) { @@ -130,21 +159,37 @@ static void __init bcm4780_init(void) { /* Enables GPIO 3 that controls HDD and led power on ASUS WL-700gE */ printk(MODULE_NAME ": Spinning up HDD and enabling leds\n"); - gpio_outen(pin, pin); - gpio_control(pin, 0); - gpio_out(pin, pin); + bcm47xx_gpio_outen(pin, pin); + bcm47xx_gpio_control(pin, 0); + bcm47xx_gpio_out(pin, pin); /* Wait 5s, so the HDD can spin up */ set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ * 5); } +static void __init NetCenter_init(void) { + /* unset pin 6 (+12V) */ + int pin = 1 << 6; + bcm47xx_gpio_outen(pin, pin); + bcm47xx_gpio_control(pin, 0); + bcm47xx_gpio_out(pin, pin); + /* unset pin 1 (turn off red led, blue will light alone if +5V comes up) */ + pin = 1 << 1; + bcm47xx_gpio_outen(pin, pin); + bcm47xx_gpio_control(pin, 0); + bcm47xx_gpio_out(pin, pin); + /* unset pin 3 (+5V) and wait 5 seconds (harddisk spin up) */ + bcm4780_init(); +} + static void __init bcm57xx_init(void) { int pin = 1 << 2; - gpio_outen(pin, pin); - gpio_control(pin, 0); - gpio_out(pin, pin); + /* FIXME: switch comes up, but port mappings/vlans not right */ + bcm47xx_gpio_outen(pin, pin); + bcm47xx_gpio_control(pin, 0); + bcm47xx_gpio_out(pin, pin); } static struct platform_t __initdata platforms[] = { @@ -159,6 +204,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 = { @@ -222,6 +277,79 @@ static struct platform_t __initdata platforms[] = { { .name = "3g_blink", .gpio = 1 << 5, .polarity = NORMAL }, }, }, + [WRT54G3GV2_VF] = { + .name = "Linksys WRT54G3GV2-VF", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "3g", .gpio = 1 << 5 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, + { .name = "3g_green", .gpio = 1 << 2, .polarity = NORMAL }, + { .name = "3g_blue", .gpio = 1 << 3, .polarity = NORMAL }, + }, + }, + [WRT150NV1] = { + .name = "Linksys WRT150N V1", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "ses", .gpio = 1 << 4 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, + { .name = "ses_green", .gpio = 1 << 5, .polarity = REVERSE }, + { .name = "ses_amber", .gpio = 1 << 3, .polarity = REVERSE }, + }, + }, + [WRT150NV11] = { + .name = "Linksys WRT150N V1.1", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "ses", .gpio = 1 << 4 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, + { .name = "ses_green", .gpio = 1 << 5, .polarity = REVERSE }, + { .name = "ses_amber", .gpio = 1 << 3, .polarity = REVERSE }, + }, + }, + [WRT160NV1] = { + .name = "Linksys WRT160N v1.x", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "ses", .gpio = 1 << 4 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, + { .name = "ses_blue", .gpio = 1 << 5, .polarity = REVERSE }, + { .name = "ses_orange", .gpio = 1 << 3, .polarity = REVERSE }, + }, + }, + [WRT160NV3] = { + .name = "Linksys WRT160N V3", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "ses", .gpio = 1 << 5 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, + { .name = "ses_blue", .gpio = 1 << 4, .polarity = REVERSE }, + { .name = "ses_orange", .gpio = 1 << 2, .polarity = REVERSE }, + }, + }, + [WRT300NV11] = { + .name = "Linksys WRT300N V1.1", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, // "Reset" on back panel + { .name = "ses", .gpio = 1 << 4 }, // "Reserved" on top panel + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, // "Power" + { .name = "ses_amber", .gpio = 1 << 3, .polarity = REVERSE }, // "Security" Amber + { .name = "ses_green", .gpio = 1 << 5, .polarity = REVERSE }, // "Security" Green + }, + .platform_init = bcm57xx_init, + }, [WRT350N] = { .name = "Linksys WRT350N", .buttons = { @@ -237,6 +365,98 @@ 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, + }, + [WRT610N] = { + .name = "Linksys WRT610N", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "ses", .gpio = 1 << 8 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, // Power LED + { .name = "usb", .gpio = 1 << 0, .polarity = REVERSE }, // USB LED + { .name = "ses_amber", .gpio = 1 << 3, .polarity = REVERSE }, // WiFi protected setup LED amber + { .name = "ses_blue", .gpio = 1 << 9, .polarity = REVERSE }, // WiFi protected setup LED blue + }, + }, + [WRT610NV2] = { + .name = "Linksys WRT610N V2", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "ses", .gpio = 1 << 4 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 5, .polarity = NORMAL }, // Power LED + { .name = "usb", .gpio = 1 << 7, .polarity = NORMAL }, // USB LED + { .name = "ses_amber", .gpio = 1 << 0, .polarity = REVERSE }, // WiFi protected setup LED amber + { .name = "ses_blue", .gpio = 1 << 3, .polarity = REVERSE }, // WiFi protected setup LED blue + { .name = "wlan", .gpio = 1 << 1, .polarity = NORMAL }, // Wireless LED + }, + }, + /* same hardware as WRT160NV3 and Cisco Valet M10V1, but different board detection, combine? */ + [E1000V1] = { + .name = "Linksys E1000 V1", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "wps", .gpio = 1 << 5 }, /* nvram get gpio5=wps_button */ + }, + .leds = { + /** turns on leds for all ethernet ports (wan too) + * this also disconnects some, or maybe all, ethernet ports + * 1: leds work normally + * 0: all lit all the time */ + /* nvram get gpio3=robo_reset */ + { .name = "wlan", .gpio = 1 << 0, .polarity = NORMAL }, + { .name = "power", .gpio = 1 << 1, .polarity = NORMAL }, + { .name = "ses_blue", .gpio = 1 << 4, .polarity = REVERSE }, /* nvram get gpio4=wps_led */ + { .name = "ses_orange", .gpio = 1 << 2, .polarity = REVERSE }, /* nvram get gpio2=wps_status_led */ + }, + }, + [E3000V1] = { + .name = "Linksys E3000 V1", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "ses", .gpio = 1 << 4 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 5, .polarity = NORMAL }, // Power LED + { .name = "usb", .gpio = 1 << 7, .polarity = NORMAL }, // USB LED + { .name = "ses_amber", .gpio = 1 << 0, .polarity = REVERSE }, // WiFi protected setup LED amber + { .name = "ses_blue", .gpio = 1 << 3, .polarity = REVERSE }, // WiFi protected setup LED blue + { .name = "wlan", .gpio = 1 << 1, .polarity = NORMAL }, // Wireless LED + }, + }, /* Asus */ [WLHDD] = { .name = "ASUS WL-HDD", @@ -245,7 +465,7 @@ static struct platform_t __initdata platforms[] = { }, .leds = { { .name = "power", .gpio = 1 << 0, .polarity = REVERSE }, - { .name = "usb", .gpio = 1 << 2, .polarity = NORMAL }, + { .name = "usb", .gpio = 1 << 2, .polarity = REVERSE }, }, }, [WL300G] = { @@ -257,6 +477,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 = { @@ -356,6 +596,17 @@ static struct platform_t __initdata platforms[] = { }, .platform_init = bcm4780_init, }, + [RTN16] = { + .name = "ASUS RT-N16", + .buttons = { + { .name = "reset", .gpio = 1 << 8 }, + { .name = "ses", .gpio = 1 << 5 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 1, .polarity = REVERSE }, + { .name = "wlan", .gpio = 1 << 7, .polarity = NORMAL }, + }, + }, /* Buffalo */ [WHR_G54S] = { .name = "Buffalo WHR-G54S", @@ -529,6 +780,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", @@ -592,6 +853,19 @@ static struct platform_t __initdata platforms[] = { { .name = "connected", .gpio = 1 << 0, .polarity = NORMAL }, }, }, + [BELKIN_F7D4301] = { + .name = "Belkin PlayMax F7D4301", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + { .name = "wps", .gpio = 1 << 8 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 11, .polarity = REVERSE }, + { .name = "wlan", .gpio = 1 << 13, .polarity = REVERSE }, + { .name = "led0", .gpio = 1 << 14, .polarity = REVERSE }, + { .name = "led1", .gpio = 1 << 15, .polarity = REVERSE }, + }, + }, /* Netgear */ [WGT634U] = { .name = "Netgear WGT634U", @@ -602,6 +876,44 @@ static struct platform_t __initdata platforms[] = { { .name = "power", .gpio = 1 << 3, .polarity = NORMAL }, }, }, + /* Netgear */ + [WNR834BV1] = { + .name = "Netgear WNR834B V1", + .buttons = { /* TODO: add reset button and confirm LEDs - GPIO from dd-wrt */ }, + .leds = { + { .name = "power", .gpio = 1 << 4, .polarity = REVERSE }, + { .name = "diag", .gpio = 1 << 5, .polarity = REVERSE }, + { .name = "wlan", .gpio = 1 << 6, .polarity = REVERSE }, + }, + }, + /* Netgear */ + [WNR834BV2] = { + .name = "Netgear WNR834B V2", + .buttons = { + { .name = "reset", .gpio = 1 << 6 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 2, .polarity = NORMAL }, + { .name = "diag", .gpio = 1 << 3, .polarity = NORMAL }, + { .name = "connected", .gpio = 1 << 7, .polarity = NORMAL }, + }, + }, + [WNDR3400V1] = { + .name = "Netgear WNDR3400 V1", + .buttons = { + /* nvram get gpio5=robo_reset */ + { .name = "reset", .gpio = 1 << 4 }, + { .name = "wps", .gpio = 1 << 6 }, + { .name = "wlan", .gpio = 1 << 8 }, + }, + .leds = { + { .name = "wlan", .gpio = 0 << 0, .polarity = NORMAL }, + { .name = "connected", .gpio = 1 << 0, .polarity = NORMAL }, + { .name = "power", .gpio = 1 << 3, .polarity = NORMAL }, + { .name = "diag", .gpio = 1 << 7, .polarity = NORMAL }, + { .name = "usb", .gpio = 1 << 2, .polarity = REVERSE }, + }, + }, /* Trendware */ [TEW411BRPP] = { .name = "Trendware TEW411BRP+", @@ -618,8 +930,7 @@ static struct platform_t __initdata platforms[] = { [STI_NAS] = { .name = "SimpleTech SimpleShare NAS", .buttons = { - { .name = "reset", .gpio = 1 << 7 }, // on back, hardwired, always resets device regardless OS state - { .name = "power", .gpio = 1 << 0 }, // on back + { .name = "reset", .gpio = 1 << 0 }, // Power button on back, named reset to enable failsafe. }, .leds = { { .name = "diag", .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready @@ -638,6 +949,20 @@ static struct platform_t __initdata platforms[] = { { .name = "blue", .gpio = 1 << 6}, }, }, + [DIR320] = { + .name = "D-Link DIR-320", + .buttons = { + { .name = "reserved", .gpio = 1 << 6}, + { .name = "reset", .gpio = 1 << 7}, + }, + .leds = { + { .name = "wlan", .gpio = 1 << 0, .polarity = NORMAL }, + { .name = "diag", .gpio = 1 << 1, .polarity = NORMAL }, /* "status led */ + { .name = "red", .gpio = 1 << 3, .polarity = REVERSE }, + { .name = "blue", .gpio = 1 << 4, .polarity = REVERSE }, + { .name = "usb", .gpio = 1 << 5, .polarity = NORMAL }, + }, + }, [DIR330] = { .name = "D-Link DIR-330", .buttons = { @@ -671,78 +996,86 @@ static struct platform_t __initdata platforms[] = { { .name = "power", .gpio = 1 << 3}, }, }, + /* Western Digital Net Center */ + [WDNetCenter] = { + .name = "Western Digital NetCenter", + .buttons = { + { .name = "power", .gpio = 1 << 0}, + { .name = "reset", .gpio = 1 << 7}, + }, + .platform_init = NetCenter_init, + }, + /* Askey (and clones) */ + [RT210W] = { + .name = "Askey RT210W", + .buttons = { + /* Power button is hard-wired to hardware reset */ + /* but is also connected to GPIO 7 (probably for bootloader recovery) */ + { .name = "power", .gpio = 1 << 7}, + }, + .leds = { + /* These were verified and named based on Belkin F5D4230-4 v1112 */ + { .name = "connected", .gpio = 1 << 0, .polarity = REVERSE }, + { .name = "wlan", .gpio = 1 << 3, .polarity = REVERSE }, + { .name = "power", .gpio = 1 << 5, .polarity = REVERSE }, + }, + }, + [WL1600GL] = { + .name = "OvisLink WL-1600GL", + .buttons = { + { .name = "reset", .gpio = 1 << 3 }, + { .name = "ses", .gpio = 1 << 4 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 5, .polarity = REVERSE }, + { .name = "wps", .gpio = 1 << 2, .polarity = REVERSE }, + { .name = "wlan", .gpio = 1 << 1, .polarity = REVERSE }, + { .name = "connected", .gpio = 1 << 0, .polarity = REVERSE }, + }, + }, + /* Microsoft */ + [MN700] = { + .name = "Microsoft MN-700", + .buttons = { + { .name = "reset", .gpio = 1 << 7 }, + }, + .leds = { + { .name = "power", .gpio = 1 << 6, .polarity = NORMAL }, + }, + }, + /* Edimax */ + [PS1208MFG] = { + .name = "Edimax PS-1208MFG", + .buttons = { + { .name = "reset", .gpio = 1 << 4 }, + }, + .leds = { + { .name = "status", .gpio = 1 << 1, .polarity = NORMAL }, + { .name = "wlan", .gpio = 1 << 0, .polarity = NORMAL }, + }, + }, }; -static struct platform_t __init *platform_detect(void) +static struct platform_t __init *platform_detect_legacy(void) { char *boardnum, *boardtype, *buf; if (strcmp(getvar("nvram_type"), "cfe") == 0) return &platforms[WGT634U]; - /* Look for a model identifier */ - - /* Based on "model_name" */ - if ((buf = nvram_get("model_name"))) { - if (!strcmp(buf, "DIR-130")) - return &platforms[DIR130]; - if (!strcmp(buf, "DIR-330")) - return &platforms[DIR330]; - } - - /* Based on "model_no" */ - if ((buf = nvram_get("model_no"))) { - if (startswith(buf,"WL700")) /* WL700* */ - return &platforms[WL700GE]; - } - - /* Based on "hardware_version" */ - if ((buf = nvram_get("hardware_version"))) { - if (startswith(buf,"WL500GPV2-")) /* WL500GPV2-* */ - return &platforms[WL500GPV2]; - if (startswith(buf,"WL520GC-")) /* WL520GU-* */ - return &platforms[WL520GC]; - if (startswith(buf,"WL520GU-")) /* WL520GU-* */ - return &platforms[WL520GU]; - } - - /* Based on "ModelId" */ - if ((buf = nvram_get("ModelId"))) { - if (!strcmp(buf, "WR850GP")) - return &platforms[WR850GP]; - if (!strcmp(buf,"WX-5565")) - return &platforms[TM2300]; - if (startswith(buf,"WE800G")) /* WE800G* */ - return &platforms[WE800G]; - } - - /* Buffalo */ - if ((buf = (nvram_get("melco_id") ?: nvram_get("buffalo_id")))) { - /* Buffalo hardware, check id for specific hardware matches */ - if (!strcmp(buf, "29bb0332")) - return &platforms[WBR2_G54]; - if (!strcmp(buf, "29129")) - return &platforms[WLA2_G54L]; - if (!strcmp(buf, "30189")) - return &platforms[WHR_HP_G54]; - if (!strcmp(buf, "32093")) - return &platforms[WHR_G125]; - if (!strcmp(buf, "30182")) - return &platforms[WHR_G54S]; - if (!strcmp(buf, "290441dd")) - return &platforms[WHR2_A54G54]; - if (!strcmp(buf, "31120")) - return &platforms[WZR_G300N]; - if (!strcmp(buf, "30083")) - return &platforms[WZR_RS_G54]; - if (!strcmp(buf, "30103")) - return &platforms[WZR_RS_G54HP]; - } /* no easy model number, attempt to guess */ 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,12 +1091,23 @@ 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, "8") && !strcmp(boardtype, "0x048e")) + return &platforms[WL1600GL]; + + + 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")) + if (!strcmp(boardtype,"0x0472")) return &platforms[WL500W]; + else if (!strcmp(boardtype,"0x467")) + return &platforms[WL320GE]; else return &platforms[WL500GD]; } @@ -773,7 +1117,22 @@ static struct platform_t __init *platform_detect(void) if (!strcmp(getvar("boardtype"), "0x0101") && !strcmp(getvar("boardrev"), "0x10")) /* SE505V2 With Modified CFE */ return &platforms[SE505V2]; - + + if (!strcmp(boardtype, "0x048e") && !strcmp(getvar("boardrev"),"0x35") && + !strcmp(getvar("boardflags"), "0x750")) /* D-Link DIR-320 */ + return &platforms[DIR320]; + + if (!strncmp(boardnum, "TH",2) && !strcmp(boardtype,"0x042f")) { + return &platforms[WDNetCenter]; + } + + if (!strcmp(boardtype,"0x0472") && !strcmp(getvar("cardbus"), "1")) { /* Netgear WNR834B V1 and V2*/ + if (!strcmp(boardnum, "08") || !strcmp(boardnum, "8")) + return &platforms[WNR834BV1]; + if (!strcmp(boardnum, "01") || !strcmp(boardnum, "1")) + return &platforms[WNR834BV2]; + } + } else { /* PMON based - old stuff */ if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) && (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) { @@ -785,8 +1144,13 @@ static struct platform_t __init *platform_detect(void) if (simple_strtoul(boardnum, NULL, 0) == 2) return &platforms[WAP54GV1]; } - if (startswith(getvar("hardware_version"), "WL500-")) - return &platforms[WL500G]; + /* MN-700 has also hardware_version 'WL500-...', so use boardnum */ + if (startswith(getvar("hardware_version"), "WL500-")) { + if (!strcmp(getvar("boardnum"), "mn700")) + return &platforms[MN700]; + else + return &platforms[WL500G]; + } if (startswith(getvar("hardware_version"), "WL300-")) { /* Either WL-300g or WL-HDD, do more extensive checks */ if ((simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 0) && @@ -803,6 +1167,18 @@ static struct platform_t __init *platform_detect(void) /* unknown asus stuff, probably bcm4702 */ if (startswith(boardnum, "asusX")) return &platforms[ASUS_4702]; + + /* bcm4702 based Askey RT210W clones, Including: + * Askey RT210W (duh?) + * Siemens SE505v1 + * Belkin F5D7230-4 before version v1444 (MiniPCI slot, not integrated) + */ + if (!strcmp(boardtype,"bcm94710r4") + && !strcmp(boardnum ,"100") + && !strcmp(getvar("pmon_ver"),"v1.03.12.bk") + ){ + return &platforms[RT210W]; + } } if (buf || !strcmp(boardnum, "00")) {/* probably buffalo */ @@ -823,16 +1199,148 @@ static struct platform_t __init *platform_detect(void) return &platforms[TEW411BRPP]; } - if (startswith(boardnum, "04FN52")) /* SimpleTech SimpleShare */ + if (startswith(boardnum, "04FN")) /* SimpleTech SimpleShare */ return &platforms[STI_NAS]; - if (!strcmp(getvar("boardnum"), "10") && !strcmp(getvar("boardrev"), "0x13")) /* D-Link DWL-3150 */ + if (!strcmp(boardnum, "10") && !strcmp(getvar("boardrev"), "0x13")) /* D-Link DWL-3150 */ return &platforms[DWL3150]; + if (!strcmp(boardnum, "01") && !strcmp(boardtype, "0x048e") && /* Edimax PS1208MFG */ + !strcmp(getvar("status_gpio"), "1")) /* gpio based detection */ + return &platforms[PS1208MFG]; + /* not found */ return NULL; } +static struct platform_t __init *platform_detect(void) +{ + enum bcm47xx_board board; + const char *board_name; + + + board = bcm47xx_board_get(); + board_name = bcm47xx_board_get_name(); + if (board != BCM47XX_BOARD_UNKNOWN && board != BCM47XX_BOARD_NON) + printk(MODULE_NAME ": kernel found a \"%s\"\n", board_name); + + switch(board) { + case BCM47XX_BOARD_ASUS_RTN16: + return &platforms[RTN16]; + case BCM47XX_BOARD_ASUS_WL330GE: + return &platforms[WL330GE]; + case BCM47XX_BOARD_ASUS_WL500GPV1: + return &platforms[WL500GP]; + case BCM47XX_BOARD_ASUS_WL500GPV2: + return &platforms[WL500GPV2]; + case BCM47XX_BOARD_ASUS_WL520GC: + return &platforms[WL520GC]; + case BCM47XX_BOARD_ASUS_WL520GU: + return &platforms[WL520GU]; + case BCM47XX_BOARD_ASUS_WL700GE: + return &platforms[WL700GE]; + case BCM47XX_BOARD_BELKIN_F7D4301: + return &platforms[BELKIN_F7D4301]; + case BCM47XX_BOARD_BUFFALO_WBR2_G54: + return &platforms[WBR2_G54]; + case BCM47XX_BOARD_BUFFALO_WHR2_A54G54: + return &platforms[WHR2_A54G54]; + case BCM47XX_BOARD_BUFFALO_WHR_G125: + return &platforms[WHR_G125]; + case BCM47XX_BOARD_BUFFALO_WHR_G54S: + return &platforms[WHR_G54S]; + case BCM47XX_BOARD_BUFFALO_WHR_HP_G54: + return &platforms[WHR_HP_G54]; + case BCM47XX_BOARD_BUFFALO_WLA2_G54L: + return &platforms[WLA2_G54L]; + case BCM47XX_BOARD_BUFFALO_WZR_G300N: + return &platforms[WZR_G300N]; + case BCM47XX_BOARD_BUFFALO_WZR_RS_G54: + return &platforms[WZR_RS_G54]; + case BCM47XX_BOARD_BUFFALO_WZR_RS_G54HP: + return &platforms[WZR_RS_G54HP]; + case BCM47XX_BOARD_DELL_TM2300: + return &platforms[TM2300]; + case BCM47XX_BOARD_DLINK_DIR130: + return &platforms[DIR130]; + case BCM47XX_BOARD_DLINK_DIR330: + return &platforms[DIR330]; + case BCM47XX_BOARD_LINKSYS_E1000V1: + return &platforms[E1000V1]; + case BCM47XX_BOARD_LINKSYS_E3000V1: + return &platforms[E3000V1]; + case BCM47XX_BOARD_LINKSYS_WRT150NV1: + return &platforms[WRT150NV1]; + case BCM47XX_BOARD_LINKSYS_WRT150NV11: + return &platforms[WRT150NV11]; + case BCM47XX_BOARD_LINKSYS_WRT160NV1: + return &platforms[WRT160NV1]; + case BCM47XX_BOARD_LINKSYS_WRT160NV3: + return &platforms[WRT160NV3]; + case BCM47XX_BOARD_LINKSYS_WRT300NV11: + return &platforms[WRT300NV11]; + case BCM47XX_BOARD_LINKSYS_WRT54G3GV2: + return &platforms[WRT54G3GV2_VF]; + case BCM47XX_BOARD_LINKSYS_WRT610NV1: + return &platforms[WRT610N]; + case BCM47XX_BOARD_LINKSYS_WRT610NV2: + return &platforms[WRT610NV2]; + case BCM47XX_BOARD_MOTOROLA_WE800G: + return &platforms[WE800G]; + case BCM47XX_BOARD_MOTOROLA_WR850GP: + return &platforms[WR850GP]; + case BCM47XX_BOARD_MOTOROLA_WR850GV2V3: + return &platforms[WR850GV2V3]; + case BCM47XX_BOARD_NETGEAR_WNDR3400V1: + return &platforms[WNDR3400V1]; + case BCM47XX_BOARD_UNKNOWN: + case BCM47XX_BOARD_NON: + printk(MODULE_NAME ": unknown board found, try legacy detect\n"); + printk(MODULE_NAME ": please open a ticket at https://dev.openwrt.org and attach the complete nvram\n"); + return platform_detect_legacy(); + default: + printk(MODULE_NAME ": board was detected as \"%s\", but not gpio configuration available\n", board_name); + printk(MODULE_NAME ": now trying legacy detect\n"); + return platform_detect_legacy(); + } +} + +static inline void ssb_maskset32(struct ssb_device *dev, + u16 offset, u32 mask, u32 set) +{ + ssb_write32(dev, offset, (ssb_read32(dev, offset) & mask) | set); +} + +static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *)) +{ + int irq; + + irq = gpio_to_irq(0); + if (irq == -EINVAL) return; + + if (enabled) { + if (request_irq(irq, handler, IRQF_SHARED, "gpio", handler)) + return; + } else { + free_irq(irq, handler); + } + + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + if (bcm47xx_bus.ssb.chipco.dev) + ssb_maskset32(bcm47xx_bus.ssb.chipco.dev, SSB_CHIPCO_IRQMASK, ~SSB_CHIPCO_IRQ_GPIO, (enabled ? SSB_CHIPCO_IRQ_GPIO : 0)); + break; +#endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + if (bcm47xx_bus.bcma.bus.drv_cc.core) + bcma_maskset32(bcm47xx_bus.bcma.bus.drv_cc.core, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO, (enabled ? BCMA_CC_IRQ_GPIO : 0)); + break; +#endif + } +} + static void register_buttons(struct button_t *b) { for (; b->name; b++) @@ -840,24 +1348,23 @@ static void register_buttons(struct button_t *b) platform.button_mask &= ~gpiomask; - gpio_outen(platform.button_mask, 0); - 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); + bcm47xx_gpio_outen(platform.button_mask, 0); + bcm47xx_gpio_control(platform.button_mask, 0); + platform.button_polarity = bcm47xx_gpio_in(~0) & platform.button_mask; + bcm47xx_gpio_polarity(platform.button_mask, platform.button_polarity); + bcm47xx_gpio_intmask(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); + bcm47xx_gpio_intmask(platform.button_mask, 0); gpio_set_irqenable(0, button_handler); } -#ifndef LINUX_2_4 static void add_msg(struct event_t *event, char *msg, int argv) { char *s; @@ -874,9 +1381,6 @@ static void hotplug_button(struct work_struct *work) struct event_t *event = container_of(work, struct event_t, wq); char *s; - if (!uevent_sock) - return; - event->skb = alloc_skb(2048, GFP_KERNEL); s = skb_put(event->skb, strlen(event->action) + 2); @@ -884,48 +1388,11 @@ static void hotplug_button(struct work_struct *work) fill_event(event); NETLINK_CB(event->skb).dst_group = 1; - netlink_broadcast(uevent_sock, event->skb, 0, 1, GFP_KERNEL); + broadcast_uevent(event->skb, 0, 1, GFP_KERNEL); kfree(event); } -#else /* !LINUX_2_4 */ -static inline char *kzalloc(unsigned int size, unsigned int gfp) -{ - char *p; - - p = kmalloc(size, gfp); - if (p == NULL) - return NULL; - - memset(p, 0, size); - - return p; -} - -static void add_msg(struct event_t *event, char *msg, int argv) -{ - if (argv) - event->argv[event->anr++] = event->scratch; - else - event->envp[event->enr++] = event->scratch; - - event->scratch += sprintf(event->scratch, "%s", msg) + 1; -} - -static void hotplug_button(struct event_t *event) -{ - char *scratch = kzalloc(256, GFP_KERNEL); - event->scratch = scratch; - - add_msg(event, hotplug_path, 1); - add_msg(event, "button", 1); - fill_event(event); - call_usermodehelper (event->argv[0], event->argv, event->envp); - kfree(scratch); - kfree(event); -} -#endif /* !LINUX_2_4 */ static int fill_event (struct event_t *event) { @@ -940,32 +1407,26 @@ static int fill_event (struct event_t *event) add_msg(event, buf, 0); snprintf(buf, 128, "SEEN=%ld", event->seen); add_msg(event, buf, 0); -#ifndef LINUX_2_4 snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum()); add_msg(event, buf, 0); -#endif return 0; } -#ifndef LINUX_2_4 static irqreturn_t button_handler(int irq, void *dev_id) -#else -static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs) -#endif { struct button_t *b; u32 in, changed; - in = gpio_in() & platform.button_mask; - gpio_intpolarity(platform.button_mask, in); + in = bcm47xx_gpio_in(~0) & platform.button_mask; + bcm47xx_gpio_polarity(platform.button_mask, in); changed = platform.button_polarity ^ in; platform.button_polarity = in; - changed &= ~gpio_outen(0, 0); + changed &= ~bcm47xx_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; @@ -976,11 +1437,7 @@ static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs) event->seen = (jiffies - b->seen)/HZ; event->name = b->name; event->action = b->pressed ? "pressed" : "released"; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) INIT_WORK(&event->wq, (void *)(void *)hotplug_button); -#else - INIT_WORK(&event->wq, (void *)(void *)hotplug_button, (void *)event); -#endif schedule_work(&event->wq); } @@ -1023,9 +1480,10 @@ static void register_leds(struct led_t *l) } } - gpio_outen(mask, oe_mask); - gpio_control(mask, 0); - gpio_out(mask, val); + bcm47xx_gpio_outen(mask, oe_mask); + bcm47xx_gpio_control(mask, 0); + bcm47xx_gpio_out(mask, val); + bcm47xx_gpio_intmask(mask, 0); } static void unregister_leds(struct led_t *l) @@ -1038,7 +1496,11 @@ static void unregister_leds(struct led_t *l) static void set_led_extif(struct led_t *led) { - gpio_set_extif(led->gpio, led->state); + volatile u8 *addr = (volatile u8 *) KSEG1ADDR(EXTIF_UART) + (led->gpio & ~GPIO_TYPE_MASK); + if (led->state) + *addr = 0xFF; + else + *addr; } static void led_flash(unsigned long dummy) { @@ -1060,11 +1522,11 @@ static void led_flash(unsigned long dummy) { mask &= ~gpiomask; if (mask) { - u32 val = ~gpio_in(); + u32 val = ~bcm47xx_gpio_in(~0); - gpio_outen(mask, mask); - gpio_control(mask, 0); - gpio_out(mask, val); + bcm47xx_gpio_outen(mask, mask); + bcm47xx_gpio_control(mask, 0); + bcm47xx_gpio_out(mask, val); } if (mask || extif_blink) { mod_timer(&led_timer, jiffies + FLASH_TIME); @@ -1073,12 +1535,7 @@ static void led_flash(unsigned long dummy) { static ssize_t diag_proc_read(struct file *file, char *buf, size_t count, loff_t *ppos) { -#ifdef LINUX_2_4 - struct inode *inode = file->f_dentry->d_inode; - struct proc_dir_entry *dent = inode->u.generic_ip; -#else struct proc_dir_entry *dent = PDE(file->f_dentry->d_inode); -#endif char *page; int len = 0; @@ -1096,7 +1553,7 @@ static ssize_t diag_proc_read(struct file *file, char *buf, size_t count, loff_t if (led->gpio & GPIO_TYPE_EXTIF) { len = sprintf(page, "%d\n", led->state); } else { - u32 in = (gpio_in() & led->gpio ? 1 : 0); + u32 in = (bcm47xx_gpio_in(~0) & led->gpio ? 1 : 0); u8 p = (led->polarity == NORMAL ? 0 : 1); len = sprintf(page, "%d\n", ((in ^ p) ? 1 : 0)); } @@ -1131,12 +1588,7 @@ static ssize_t diag_proc_read(struct file *file, char *buf, size_t count, loff_t static ssize_t diag_proc_write(struct file *file, const char *buf, size_t count, loff_t *ppos) { -#ifdef LINUX_2_4 - struct inode *inode = file->f_dentry->d_inode; - struct proc_dir_entry *dent = inode->u.generic_ip; -#else struct proc_dir_entry *dent = PDE(file->f_dentry->d_inode); -#endif char *page; int ret = -EINVAL; @@ -1165,9 +1617,9 @@ static ssize_t diag_proc_write(struct file *file, const char *buf, size_t count, led->state = p ^ ((page[0] == '1') ? 1 : 0); set_led_extif(led); } else { - gpio_outen(led->gpio, led->gpio); - gpio_control(led->gpio, 0); - gpio_out(led->gpio, ((p ^ (page[0] == '1')) ? led->gpio : 0)); + bcm47xx_gpio_outen(led->gpio, led->gpio); + bcm47xx_gpio_control(led->gpio, 0); + bcm47xx_gpio_out(led->gpio, ((p ^ (page[0] == '1')) ? led->gpio : 0)); } } break;