X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-4.4%2F378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch;fp=target%2Flinux%2Fbrcm63xx%2Fpatches-4.4%2F378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch;h=0000000000000000000000000000000000000000;hb=771f1ca3ffe10871893751ab384de3b7a9b06610;hp=6eb1bd02849c35e52045e1e3ae3763bd12b2f022;hpb=1de74df8b9bbaafd147a2380fa306140b79b60d9;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch b/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch
deleted file mode 100644
index 6eb1bd0284..0000000000
--- a/target/linux/brcm63xx/patches-4.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e55892aac9d5508a000647ca66f0e678e02be3bb Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 21 Feb 2015 17:26:50 +0100
-Subject: [PATCH 5/6] MIPS: BCM63XX: do not register gpio-controller if
-present in dtb
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/gpio.c |   7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/arch/mips/bcm63xx/gpio.c
-+++ b/arch/mips/bcm63xx/gpio.c
-@@ -20,6 +20,8 @@
- #include <bcm63xx_gpio.h>
- #include <bcm63xx_regs.h>
- 
-+#include "boards/board_common.h"
-+
- static const char * const gpio_chip_labels[] = {
- 	"bcm63xx-gpio.0",
- 	"bcm63xx-gpio.1",
-@@ -48,8 +50,10 @@ static void __init bcm63xx_gpio_init_one
- 	pdata.base = id * 32;
- 	pdata.ngpio = ngpio;
- 
--	platform_device_register_resndata(NULL, "bcm63xx-gpio", id, res, 2,
--					  &pdata, sizeof(pdata));
-+	if (!board_of_device_present("gpio0") &&
-+	    !board_of_device_present("pinctrl"))
-+		platform_device_register_resndata(NULL, "bcm63xx-gpio", id, res,
-+						  2, &pdata, sizeof(pdata));
- }
- 
- int __init bcm63xx_gpio_init(void)