[backfire] cleanup: remove refs to unsupported "iop32x" target

[openwrt-10.03/.git] / package / switch / src / switch-adm.c

diff --git a/package/switch/src/switch-adm.c b/package/switch/src/switch-adm.c
index 8d96316b7c1043eec19aa99e65957c928eb1d923..89efed1e8242869489b74971118e199bd11254cb 100644 (file)
--- a/package/switch/src/switch-adm.c
+++ b/package/switch/src/switch-adm.c
@@ -26,7 +26,6 @@
  * 02110-1301, USA.
  */
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -75,7 +74,7 @@ MODULE_PARM(force, "i");
 
 #define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
 
-#if defined(BCMGPIO2) || defined(BCMGPIO)
+#ifdef BROADCOM
 extern char *nvram_get(char *name);
 
 /* Return gpio pin number assigned to the named pin */
@@ -86,7 +85,7 @@ extern char *nvram_get(char *name);
 *
 * 'def_pin' is returned if there is no such variable found.
 */
-static unsigned int getgpiopin(char *pin_name, unsigned int def_pin)
+static unsigned int get_gpiopin(char *pin_name, unsigned int def_pin)
 {
        char name[] = "gpioXXXX";
        char *val;
@@ -496,25 +495,25 @@ static int detect_adm(void)
 {
        int ret = 0;
 
-#if defined(BCMGPIO2) || defined(BCMGPIO)
+#ifdef BROADCOM
        int boardflags = atoi(nvram_get("boardflags"));
         int boardnum = atoi(nvram_get("boardnum"));
 
-        if (boardnum == 44) {   /* Trendware TEW-411BRP+ */
-                ret = 1;
+       if ((boardnum == 44) && (boardflags == 0x0388)) {  /* Trendware TEW-411BRP+ */
+               ret = 1;
 
-                eecs = getgpiopin("adm_eecs", 2);
-                eesk = getgpiopin("adm_eesk", 3);
-                eedi = getgpiopin("adm_eedi", 4);
-                eerc = getgpiopin("adm_rc", 5);
+               eecs = get_gpiopin("adm_eecs", 2);
+               eesk = get_gpiopin("adm_eesk", 3);
+               eedi = get_gpiopin("adm_eedi", 4);
+               eerc = get_gpiopin("adm_rc", 5);
 
        } else if ((boardflags & 0x80) || force) {
                ret = 1;
 
-               eecs = getgpiopin("adm_eecs", 2);
-               eesk = getgpiopin("adm_eesk", 3);
-               eedi = getgpiopin("adm_eedi", 4);
-               eerc = getgpiopin("adm_rc", 0);
+               eecs = get_gpiopin("adm_eecs", 2);
+               eesk = get_gpiopin("adm_eesk", 3);
+               eedi = get_gpiopin("adm_eedi", 4);
+               eerc = get_gpiopin("adm_rc", 0);
 
        } else if ((strcmp(nvram_get("boardtype") ?: "", "bcm94710dev") == 0) &&
                        (strncmp(nvram_get("boardnum") ?: "", "42", 2) == 0)) {
@@ -524,9 +523,8 @@ static int detect_adm(void)
                eedi = 5;
 
                ret = 1;
-       } else
-               printk("BFL_ENETADM not set in boardflags. Use force=1 to ignore.\n");
-               
+       }
+
        if (eecs)
                eecs = (1 << eecs);
        if (eesk)