diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-03 01:53:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-03 01:53:30 +0000 |
| commit | 25afeba608b9db64cc0cab1f7be790f64193f590 (patch) | |
| tree | f293f93d06a2a30ce21d64d2a64763ba7bbd4e6c /package/switch/src/switch-adm.c | |
| parent | edc7ab525ff7cc45ea478b8b936e596789eb851a (diff) | |
| download | mtk-20170518-25afeba608b9db64cc0cab1f7be790f64193f590.zip mtk-20170518-25afeba608b9db64cc0cab1f7be790f64193f590.tar.gz mtk-20170518-25afeba608b9db64cc0cab1f7be790f64193f590.tar.bz2 | |
brcm47xx: add a new version of the nvram rewrite patch
This is the version like it was send for mainline inclusion.
SVN-Revision: 34988
Diffstat (limited to 'package/switch/src/switch-adm.c')
| -rw-r--r-- | package/switch/src/switch-adm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/switch/src/switch-adm.c b/package/switch/src/switch-adm.c index 9a6d32b..f21470e 100644 --- a/package/switch/src/switch-adm.c +++ b/package/switch/src/switch-adm.c @@ -38,7 +38,7 @@ #include "gpio.h" #ifdef CONFIG_BCM47XX -#include <nvram.h> +#include <bcm47xx_nvram.h> #endif #define DRIVER_NAME "adm6996" @@ -89,7 +89,7 @@ static unsigned int get_gpiopin(char *pin_name, unsigned int def_pin) /* Go thru all possibilities till a match in pin name */ for (pin = 0; pin < 16; pin ++) { sprintf(name, "gpio%d", pin); - if (nvram_getenv(name, val, sizeof(val)) >= 0) { + if (bcm47xx_nvram_getenv(name, val, sizeof(val)) >= 0) { if (!strcmp(val, pin_name)) return pin; } @@ -497,10 +497,10 @@ static int detect_adm(void) int boardflags = 0; int boardnum = 0; - if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) + if (bcm47xx_nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) boardflags = simple_strtoul(buf, NULL, 0); - if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) + if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) boardnum = simple_strtoul(buf, NULL, 0); if ((boardnum == 44) && (boardflags == 0x0388)) { /* Trendware TEW-411BRP+ */ @@ -519,9 +519,9 @@ static int detect_adm(void) eedi = get_gpiopin("adm_eedi", 4); eerc = get_gpiopin("adm_rc", 0); - } else if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) { + } else if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) { if (strcmp(buf, "bcm94710dev") == 0) { - if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) { + if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) { if (strncmp(buf, "42", 2) == 0) { /* WRT54G v1.1 hack */ eecs = 2; |