X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbroadcom-diag%2Fsrc%2Fdiag.c;h=0b59ab12cfebddae3a4dad40271183ce48984e7b;hb=46f75ee8698d09dcbb97447fcd2c6f5473c52331;hp=e1655d0b742bbfb83100ddf4c96bf079b6c7dc2d;hpb=99b6b35be3a3261cfa016d4de750fcf54fea1e3f;p=openwrt%2Fopenwrt.git

diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index e1655d0b74..0b59ab12cf 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 <linux/module.h>
 #include <linux/pci.h>
@@ -55,16 +54,24 @@ module_param(gpiomask, int, 0644);
 enum {
 	/* Linksys */
 	WAP54GV1,
+	WAP54GV2,
 	WAP54GV3,
 	WRT54GV1,
 	WRT54G,
 	WRTSL54GS,
 	WRT54G3G,
+	WRT160N,
+	WRT300NV11,
 	WRT350N,
+	WRT600N,
+	WRT600NV11,
+	WRT610N,
 
 	/* ASUS */
 	WLHDD,
 	WL300G,
+	WL320GE,
+	WL330GE,
 	WL500G,
 	WL500GD,
 	WL500GP,
@@ -97,6 +104,7 @@ enum {
 
 	/* Dell */
 	TM2300,
+	TM2300V2,
 
 	/* Motorola */
 	WE800G,
@@ -118,6 +126,7 @@ enum {
 
 	/* D-Link */
 	DIR130,
+	DIR320,
 	DIR330,
 	DWL3150,
 
@@ -142,9 +151,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[] = {
@@ -159,6 +171,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 +244,31 @@ static struct platform_t __initdata platforms[] = {
 			{ .name = "3g_blink",	.gpio = 1 << 5, .polarity = NORMAL },
 		},
 	},
+	[WRT160N] = {
+		.name		= "Linksys WRT160N",
+		.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 },
+		},
+	},
+	[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 +284,51 @@ 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
+		},
+	},
 	/* Asus */
 	[WLHDD] = {
 		.name		= "ASUS WL-HDD",
@@ -257,6 +349,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 +603,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 +615,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 +641,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",
@@ -637,6 +760,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	= {
@@ -682,35 +819,45 @@ static struct platform_t __init *platform_detect(void)
 	/* Look for a model identifier */
 
 	/* Based on "model_name" */
-	if (buf = nvram_get("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 "wsc_modelname */
+	if ((buf = nvram_get("wsc_modelname"))) {
+		if (!strcmp(buf, "WRT610N"))
+			return &platforms[WRT610N];
+	}
+
 	/* Based on "model_no" */
-	if (buf = nvram_get("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 ((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];
+		if (startswith(buf,"WL330GE-")) /* WL330GE-* */
+			return &platforms[WL330GE];
 	}
 
 	/* Based on "ModelId" */
-	if (buf = nvram_get("ModelId")) {
+	if ((buf = nvram_get("ModelId"))) {
 		if (!strcmp(buf, "WR850GP"))
 			return &platforms[WR850GP];
-		if (!strcmp(buf,"WX-5565"))
-			return &platforms[TM2300];
+		if (!strcmp(buf, "WR850G"))
+			return &platforms[WR850GV2V3];
+		if (!strcmp(buf, "WX-5565") && !strcmp(getvar("boardtype"),"bcm94710ap"))
+			return &platforms[TM2300]; /* Dell TrueMobile 2300 */
 		if (startswith(buf,"WE800G")) /* WE800G* */
 			return &platforms[WE800G];
 	}
@@ -742,9 +889,20 @@ 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 */
+			if (!strcmp(boardtype, "0x478") && !strcmp(getvar("boot_hw_model"), "WRT300N") && !strcmp(getvar("boot_hw_ver"), "1.1"))
+				return &platforms[WRT300NV11];
+
 			if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "1"))
 				return &platforms[WRT350N];
 
@@ -754,15 +912,27 @@ static struct platform_t __init *platform_detect(void)
 			if (!strcmp(getvar("et1phyaddr"),"5") && !strcmp(getvar("et1mdcport"), "1"))
 				return &platforms[WRTSL54GS];
 
+			if (!strcmp(boardtype, "0x0472"))
+				return &platforms[WRT160N];
+
 			/* 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"))
+				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 +940,13 @@ 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];
+
+		if (!strcmp(boardtype, "0x048e") && !strcmp(getvar("boardrev"),"0x35") &&
+				!strcmp(getvar("boardflags"), "0x750")) /* D-Link DIR-320 */
+			return &platforms[DIR320];
+
 	} else { /* PMON based - old stuff */
 		if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) &&
 			(simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {
@@ -840,14 +1017,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 +1138,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 +1199,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)