diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-08-01 19:04:12 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-08-01 19:04:12 +0000 |
| commit | 81ca618b45fe2a063e968e1ae3d90fb01af4db40 (patch) | |
| tree | c0caad1ae1a52896710404f9e3201cd065720825 /target/linux | |
| parent | 00759f796b5f80dbeee615d2f16f9fa4e63b3161 (diff) | |
brcm47xx: add function to get a gpio pin by name
bcm47xx_nvram_gpio_pin() returns a gpio pin number for a given name based
on configuration data in nvram.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37644 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
3 files changed, 38 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/180-bcm47xx-nvram-gpio.patch b/target/linux/brcm47xx/patches-3.10/180-bcm47xx-nvram-gpio.patch new file mode 100644 index 0000000000..c4efeab313 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/180-bcm47xx-nvram-gpio.patch @@ -0,0 +1,35 @@ +--- a/arch/mips/bcm47xx/nvram.c ++++ b/arch/mips/bcm47xx/nvram.c +@@ -190,3 +190,23 @@ int bcm47xx_nvram_getenv(char *name, cha + return -ENOENT; + } + EXPORT_SYMBOL(bcm47xx_nvram_getenv); ++ ++int bcm47xx_nvram_gpio_pin(const char *name) ++{ ++ int i, err; ++ char nvram_var[10]; ++ char buf[30]; ++ ++ for (i = 0; i < 16; i++) { ++ err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i); ++ if (err <= 0) ++ continue; ++ err = bcm47xx_nvram_getenv(nvram_var, buf, sizeof(buf)); ++ if (err <= 0) ++ continue; ++ if (!strcmp(name, buf)) ++ return i; ++ } ++ return -ENOENT; ++} ++EXPORT_SYMBOL(bcm47xx_nvram_gpio_pin); +--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h ++++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h +@@ -48,4 +48,6 @@ static inline void bcm47xx_nvram_parse_m + printk(KERN_WARNING "Can not parse mac address: %s\n", buf); + } + ++int bcm47xx_nvram_gpio_pin(const char *name); ++ + #endif /* __BCM47XX_NVRAM_H */ diff --git a/target/linux/brcm47xx/patches-3.10/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.10/400-arch-bcm47xx.patch index 9d7c9bb934..ed3e81600a 100644 --- a/target/linux/brcm47xx/patches-3.10/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-3.10/400-arch-bcm47xx.patch @@ -1,9 +1,9 @@ --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c -@@ -190,3 +190,30 @@ int bcm47xx_nvram_getenv(char *name, cha +@@ -210,3 +210,30 @@ int bcm47xx_nvram_gpio_pin(const char *n return -ENOENT; } - EXPORT_SYMBOL(bcm47xx_nvram_getenv); + EXPORT_SYMBOL(bcm47xx_nvram_gpio_pin); + +char *nvram_get(const char *name) +{ diff --git a/target/linux/brcm47xx/patches-3.10/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-3.10/820-wgt634u-nvram-fix.patch index cf21550239..96b6ed84c1 100644 --- a/target/linux/brcm47xx/patches-3.10/820-wgt634u-nvram-fix.patch +++ b/target/linux/brcm47xx/patches-3.10/820-wgt634u-nvram-fix.patch @@ -294,7 +294,7 @@ out the configuration than the in kernel cfe config reader. /* Look for name=value and return value */ var = &nvram_buf[sizeof(struct nvram_header)]; end = nvram_buf + sizeof(nvram_buf) - 2; -@@ -201,6 +230,9 @@ char *nvram_get(const char *name) +@@ -221,6 +250,9 @@ char *nvram_get(const char *name) if (!nvram_buf[0]) nvram_init(); |