X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/82212c6f65be34b9f6fbe1983249fdf492ec2c93..a3f0c9fadfeb93126c402b57062f747e129d384c:/package/switch/src/switch-adm.c diff --git a/package/switch/src/switch-adm.c b/package/switch/src/switch-adm.c index 89efed1e8..3826ca57f 100644 --- a/package/switch/src/switch-adm.c +++ b/package/switch/src/switch-adm.c @@ -2,7 +2,7 @@ * ADMTEK Adm6996 switch configuration module * * Copyright (C) 2005 Felix Fietkau - * + * * Partially based on Broadcom Home Networking Division 10/100 Mbit/s * Ethernet Device Driver (from Montavista 2.4.20_mvl31 Kernel). * Copyright (C) 2004 Broadcom Corporation @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ @@ -37,6 +37,10 @@ #include "switch-core.h" #include "gpio.h" +#ifdef CONFIG_BCM47XX +#include +#endif + #define DRIVER_NAME "adm6996" #define DRIVER_VERSION "0.01" @@ -48,19 +52,11 @@ static int force = 0; MODULE_AUTHOR("Felix Fietkau "); MODULE_LICENSE("GPL"); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,52) module_param(eecs, int, 0); module_param(eesk, int, 0); module_param(eedi, int, 0); module_param(eerc, int, 0); module_param(force, int, 0); -#else -MODULE_PARM(eecs, "i"); -MODULE_PARM(eesk, "i"); -MODULE_PARM(eedi, "i"); -MODULE_PARM(eerc, "i"); -MODULE_PARM(force, "i"); -#endif /* Minimum timing constants */ #define EECK_EDGE_TIME 3 /* 3us - max(adm 2.5us, 93c 1us) */ @@ -74,8 +70,7 @@ MODULE_PARM(force, "i"); #define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0) -#ifdef BROADCOM -extern char *nvram_get(char *name); +#ifdef CONFIG_BCM47XX /* Return gpio pin number assigned to the named pin */ /* @@ -88,15 +83,16 @@ extern char *nvram_get(char *name); static unsigned int get_gpiopin(char *pin_name, unsigned int def_pin) { char name[] = "gpioXXXX"; - char *val; + char val[10]; unsigned int pin; /* Go thru all possibilities till a match in pin name */ for (pin = 0; pin < 16; pin ++) { sprintf(name, "gpio%d", pin); - val = nvram_get(name); - if (val && !strcmp(val, pin_name)) - return pin; + if (nvram_getenv(name, val, sizeof(val)) >= 0) { + if (!strcmp(val, pin_name)) + return pin; + } } return def_pin; } @@ -182,10 +178,10 @@ static void adm_read(int cs, char *buf, unsigned int bits) /* Enable outputs with specified value to the chip */ static void adm_enout(__u8 pins, __u8 val) -{ +{ /* Prepare GPIO output value */ gpio_out(pins, val); - + /* Enable GPIO outputs */ gpio_outen(pins, pins); udelay(EECK_EDGE_TIME); @@ -194,7 +190,7 @@ static void adm_enout(__u8 pins, __u8 val) /* Disable outputs to the chip */ static void adm_disout(__u8 pins) -{ +{ /* Disable GPIO outputs */ gpio_outen(pins, 0); udelay(EECK_EDGE_TIME); @@ -285,17 +281,17 @@ static int vlan_ports[] = { 1 << 0, 1 << 2, 1 << 4, 1 << 6, 1 << 7, 1 << 8 }; static int handle_vlan_port_read(void *driver, char *buf, int nr) { int ports, i, c, len = 0; - + if ((nr < 0) || (nr > 15)) return 0; /* Get VLAN port map */ ports = adm_rreg(0, 0x13 + nr); - + for (i = 0; i <= 5; i++) { if (ports & vlan_ports[i]) { c = adm_rreg(0, port_conf[i]); - + len += sprintf(buf + len, "%d", i); if (c & (1 << 4)) { buf[len++] = 't'; @@ -327,17 +323,17 @@ static int handle_vlan_port_write(void *driver, char *buf, int nr) ports |= vlan_ports[i]; cfg = adm_rreg(0, port_conf[i]); - + /* Tagging */ if (c->untag & (1 << i)) cfg &= ~(1 << 4); else cfg |= (1 << 4); - + if ((c->untag | c->pvid) & (1 << i)) { cfg = (cfg & ~(0xf << 10)) | (nr << 10); } - + adm_wreg(port_conf[i], (__u16) cfg); } else { ports &= ~(vlan_ports[i]); @@ -345,6 +341,7 @@ static int handle_vlan_port_write(void *driver, char *buf, int nr) } adm_wreg(0x13 + nr, (__u16) ports); + kfree(c); return 0; } @@ -356,7 +353,7 @@ static int handle_port_enable_read(void *driver, char *buf, int nr) static int handle_port_enable_write(void *driver, char *buf, int nr) { int reg = adm_rreg(0, port_conf[nr]); - + if (buf[0] == '0') reg |= (1 << 5); else if (buf[0] == '1') @@ -391,7 +388,7 @@ static int handle_port_media_write(void *driver, char *buf, int nr) if (media < 0) return -1; - + reg &= ~((1 << 1) | (1 << 2) | (1 << 3)); if (media & SWITCH_MEDIA_AUTO) reg |= 1 << 1; @@ -401,7 +398,7 @@ static int handle_port_media_write(void *driver, char *buf, int nr) reg |= 1 << 3; adm_wreg(port_conf[nr], reg); - + return 0; } @@ -413,7 +410,7 @@ static int handle_vlan_enable_read(void *driver, char *buf, int nr) static int handle_vlan_enable_write(void *driver, char *buf, int nr) { int reg = adm_rreg(0, 0x11); - + if (buf[0] == '1') reg |= (1 << 5); else if (buf[0] == '0') @@ -453,7 +450,7 @@ static int handle_reset(void *driver, char *buf, int nr) udelay(1000); /* Leave RC high and disable GPIO outputs */ adm_disout((__u8)(eecs | eesk | eedi)); - + } /* set up initial configuration for cpu port */ @@ -462,7 +459,7 @@ static int handle_reset(void *driver, char *buf, int nr) (1 << 4) | /* Tagging */ 0xf); /* full duplex, 100Mbps, auto neg, flow ctrl */ adm_wreg(port_conf[5], cfg); - + /* vlan mode select register (0x11): vlan on, mac clone */ adm_wreg(0x11, 0xff30); @@ -472,7 +469,7 @@ static int handle_reset(void *driver, char *buf, int nr) static int handle_registers(void *driver, char *buf, int nr) { int i, len = 0; - + for (i = 0; i <= 0x33; i++) { len += sprintf(buf + len, "0x%02x: 0x%04x\n", i, adm_rreg(0, i)); } @@ -495,9 +492,16 @@ static int detect_adm(void) { int ret = 0; -#ifdef BROADCOM - int boardflags = atoi(nvram_get("boardflags")); - int boardnum = atoi(nvram_get("boardnum")); +#ifdef CONFIG_BCM47XX + char buf[20]; + int boardflags = 0; + int boardnum = 0; + + if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) + boardflags = simple_strtoul(buf, NULL, 0); + + if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) + boardnum = simple_strtoul(buf, NULL, 0); if ((boardnum == 44) && (boardflags == 0x0388)) { /* Trendware TEW-411BRP+ */ ret = 1; @@ -515,14 +519,19 @@ static int detect_adm(void) 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)) { - /* WRT54G v1.1 hack */ - eecs = 2; - eesk = 3; - eedi = 5; - - ret = 1; + } else if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) { + if (strcmp(buf, "bcm94710dev") == 0) { + if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) { + if (strncmp(buf, "42", 2) == 0) { + /* WRT54G v1.1 hack */ + eecs = 2; + eesk = 3; + eedi = 5; + + ret = 1; + } + } + } } if (eecs)