From: Rafał Miłecki <zajec5@gmail.com>
Date: Thu, 3 Dec 2015 08:36:41 +0000 (+0000)
Subject: bcm53xx: set vcc-gpio properties in one patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e837fa130e4187919b5b4e1d89b2519e44806c4;p=openwrt%2Fstaging%2Fwigyori.git

bcm53xx: set vcc-gpio properties in one patch

No reason to handle Buffalo WXR-1900DHP in separated patch.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 47706
---

diff --git a/target/linux/bcm53xx/patches-4.4/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch b/target/linux/bcm53xx/patches-4.4/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch
deleted file mode 100644
index b721cefeae..0000000000
--- a/target/linux/bcm53xx/patches-4.4/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 504dba5b073a9009ae1e3f2fc53ea9c3aa10c38a Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@openwrt.org>
-Date: Wed, 13 May 2015 20:56:38 +0200
-Subject: [PATCH] ARM: BCM5301X: Add Buffalo WXR-1900DHP clock and USB power
- control
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -24,6 +24,17 @@
- 		reg = <0x00000000 0x08000000>;
- 	};
- 
-+	axi@18000000 {
-+		usb2@21000 {
-+			reg = <0x00021000 0x1000>;
-+
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
-+		};
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 
diff --git a/target/linux/bcm53xx/patches-4.4/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch b/target/linux/bcm53xx/patches-4.4/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch
index e9b1b32819..32a9680f2c 100644
--- a/target/linux/bcm53xx/patches-4.4/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch
+++ b/target/linux/bcm53xx/patches-4.4/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch
@@ -64,3 +64,23 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  	leds {
  		compatible = "gpio-leds";
  
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -24,6 +24,17 @@
+ 		reg = <0x00000000 0x08000000>;
+ 	};
+ 
++	axi@18000000 {
++		usb2@21000 {
++			reg = <0x00021000 0x1000>;
++
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
+ 	leds {
+ 		compatible = "gpio-leds";
+