X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fpatches-3.10%2F085-MIPS-BCM47XX-Get-GPIO-pin-from-nvram-configuration.patch;fp=target%2Flinux%2Fbrcm47xx%2Fpatches-3.10%2F085-MIPS-BCM47XX-Get-GPIO-pin-from-nvram-configuration.patch;h=0000000000000000000000000000000000000000;hb=e1816b38c83c7a69eed35746bd3b57fc8bff176a;hp=a0f91a48adba8d42280533e58974d6c1e14ac1d7;hpb=bb79f04992b59f364a802fe4666ab5f690e86d3a;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/brcm47xx/patches-3.10/085-MIPS-BCM47XX-Get-GPIO-pin-from-nvram-configuration.patch b/target/linux/brcm47xx/patches-3.10/085-MIPS-BCM47XX-Get-GPIO-pin-from-nvram-configuration.patch
deleted file mode 100644
index a0f91a48ad..0000000000
--- a/target/linux/brcm47xx/patches-3.10/085-MIPS-BCM47XX-Get-GPIO-pin-from-nvram-configuration.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit e49ec29e2da1fd7cdd6d966f389add031a1027a9
-Author: Hauke Mehrtens <hauke@hauke-m.de>
-Date:   Wed Sep 18 13:31:15 2013 +0200
-
-    MIPS: BCM47XX: Get GPIO pin from nvram configuration
-    
-    The nvram contains some gpio configuration for boards. It is stored in
-    a gpio<number>=name format e.g.
-    gpio8=wps_button
-    gpio4=robo_reset
-    
-    This patches adds a function to parse these entries, so other driver
-    can use it.
-    
-    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-    Cc: linux-mips@linux-mips.org
-    Patchwork: https://patchwork.linux-mips.org/patch/5841/
-    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-
---- 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 */