From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 6 Oct 2013 23:57:11 +0000 (+0000)
Subject: brcm47xx: move and rename nvram gpio patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c193a30ce2f925a67ea90a0ceefeddea50d54e4;p=openwrt%2Fstaging%2Fluka.git

brcm47xx: move and rename nvram gpio patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38310
---

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
new file mode 100644
index 0000000000..a0f91a48ad
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.10/085-MIPS-BCM47XX-Get-GPIO-pin-from-nvram-configuration.patch
@@ -0,0 +1,54 @@
+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 */
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
deleted file mode 100644
index c4efeab313..0000000000
--- a/target/linux/brcm47xx/patches-3.10/180-bcm47xx-nvram-gpio.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 */