[package] let usb-video load after video-core (#6214)

[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 4667591..89af0f7 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -60,9 +60,11 @@ enum {
        WRT54G,
        WRTSL54GS,
        WRT54G3G,
+       WRT160N,
        WRT350N,
        WRT600N,
        WRT600NV11,
+       WRT610N,
 
        /* ASUS */
        WLHDD,
@@ -123,6 +125,7 @@ enum {
 
        /* D-Link */
        DIR130,
+       DIR320,
        DIR330,
        DWL3150,
 
@@ -240,6 +243,18 @@ 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 },
+               },
+       },
        [WRT350N] = {
                .name           = "Linksys WRT350N",
                .buttons        = {
@@ -287,6 +302,19 @@ static struct platform_t __initdata platforms[] = {
                },
                .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",
@@ -718,6 +746,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        = {
@@ -770,6 +812,12 @@ static struct platform_t __init *platform_detect(void)
                        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 (startswith(buf,"WL700")) /* WL700* */
@@ -847,6 +895,9 @@ 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];
                }
@@ -875,6 +926,10 @@ 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];
+
        } else { /* PMON based - old stuff */
                if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) &&
                        (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {