bcm53xx: backport upstream profiling and USB VCC patches

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

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49172 3c298f89-4303-0410-b956-a3cf2f4a3e73

10 files changed, 145 insertions, 83 deletions

diff --git a/target/linux/bcm53xx/patches-3.18/340-ARM-BCM5301X-Add-profiling-support.patch b/target/linux/bcm53xx/patches-3.18/068-ARM-BCM5301X-Add-profiling-support.patch
index 291ec72f2c..ef3d35fdb5 100644
--- a/target/linux/bcm53xx/patches-3.18/340-ARM-BCM5301X-Add-profiling-support.patch
+++ b/target/linux/bcm53xx/patches-3.18/068-ARM-BCM5301X-Add-profiling-support.patch
@@ -1,7 +1,14 @@
+From 1ff80363524cf78e2894b1c6fdd5b7b03ea41994 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Wed, 29 Jul 2015 23:51:00 +0200
 Subject: [PATCH] ARM: BCM5301X: Add profiling support
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Olof Johansson <olof@lixom.net>
 ---
+
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
 @@ -82,6 +82,13 @@
diff --git a/target/linux/bcm53xx/patches-3.18/071-ARM-BCM5301X-Netgear-R6250-add-USB-GPIO.patch b/target/linux/bcm53xx/patches-3.18/071-ARM-BCM5301X-Netgear-R6250-add-USB-GPIO.patch
index d8f4aeb7e4..d1f9f048bb 100644
--- a/target/linux/bcm53xx/patches-3.18/071-ARM-BCM5301X-Netgear-R6250-add-USB-GPIO.patch
+++ b/target/linux/bcm53xx/patches-3.18/071-ARM-BCM5301X-Netgear-R6250-add-USB-GPIO.patch
@@ -10,8 +10,8 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -34,6 +34,17 @@
- 		};
+@@ -24,6 +24,17 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	axi@18000000 {
diff --git a/target/linux/bcm53xx/patches-3.18/074-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers-of-few.patch b/target/linux/bcm53xx/patches-3.18/074-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers-of-few.patch
new file mode 100644
index 0000000000..e763ad5b0f
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/074-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers-of-few.patch
@@ -0,0 +1,117 @@
+From dd70ccfaa79189feaa78609d44f7c3e7fa1dc6ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Wed, 23 Mar 2016 16:52:47 +0100
+Subject: [PATCH] ARM: BCM5301X: Set vcc-gpio for USB controllers of few
+ devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are few devices that have USB power controlled using GPIO. Linux
+USB host driver (bcma-hcd) already supports this by reading vcc-gpio
+from DT. Set it properly for all known devices.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -139,3 +139,11 @@
+ &uart0 {
+ 	status = "okay";
+ };
++
++&usb2 {
++	vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3 {
++	vcc-gpio = <&chipcommon 10 GPIO_ACTIVE_LOW>;
++};
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -24,17 +24,6 @@
+ 		reg = <0x00000000 0x08000000>;
+ 	};
+ 
+-	axi@18000000 {
+-		usb3@23000 {
+-			reg = <0x00023000 0x1000>;
+-
+-			#address-cells = <1>;
+-			#size-cells = <1>;
+-
+-			vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
+-		};
+-	};
+-
+ 	leds {
+ 		compatible = "gpio-leds";
+ 
+@@ -97,3 +86,7 @@
+ &uart0 {
+ 	status = "okay";
+ };
++
++&usb3 {
++	vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
++};
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -126,3 +126,8 @@
+ 		};
+ 	};
+ };
++
++
++&usb2 {
++	vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
++};
+--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+@@ -106,3 +106,11 @@
+ 		};
+ 	};
+ };
++
++&usb2 {
++	vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3 {
++	vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
++};
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -109,3 +109,7 @@
+ 	status = "okay";
+ 	clock-frequency = <125000000>;
+ };
++
++&usb3 {
++	vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
++};
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -173,6 +173,20 @@
+ 			gpio-controller;
+ 			#gpio-cells = <2>;
+ 		};
++
++		usb2: usb2@21000 {
++			reg = <0x00021000 0x1000>;
++
++			#address-cells = <1>;
++			#size-cells = <1>;
++		};
++
++		usb3: usb3@23000 {
++			reg = <0x00023000 0x1000>;
++
++			#address-cells = <1>;
++			#size-cells = <1>;
++		};
+ 	};
+ 
+ 	nand: nand@18028000 {
diff --git a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch
index ca6462e3c7..3d054a80d6 100644
--- a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch
+++ b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch
@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/arch/arm/boot/dts/bcm5301x.dtsi
 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -95,6 +95,10 @@
+@@ -102,6 +102,10 @@
  		};
  	};
  
diff --git a/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch b/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
index 5f990dafde..86c2833e66 100644
--- a/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
+++ b/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
@@ -38,7 +38,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +		       0x88000000 0x08000000>;
  	};
  
- 	chipcommonA {
+ 	leds {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 @@ -21,7 +21,8 @@
diff --git a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch b/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch
deleted file mode 100644
index 8e6081d6dc..0000000000
--- a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Sun, 21 Jun 2015 12:56:32 +0200
-Subject: [PATCH] ARM: BCM5301X: Set vcc-gpio for USB controllers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -25,6 +25,26 @@
- 		       0x88000000 0x18000000>;
- 	};
- 
-+	axi@18000000 {
-+		usb2@21000 {
-+			reg = <0x00021000 0x1000>;
-+
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		usb3@23000 {
-+			reg = <0x00023000 0x1000>;
-+
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			vcc-gpio = <&chipcommon 10 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
- 	spi {
- 		compatible = "spi-gpio";
- 		num-chipselects = <1>;
---- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-@@ -25,6 +25,26 @@
- 		       0x88000000 0x08000000>;
- 	};
- 
-+	axi@18000000 {
-+		usb2@21000 {
-+			reg = <0x00021000 0x1000>;
-+
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		usb3@23000 {
-+			reg = <0x00023000 0x1000>;
-+
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
-+		};
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 
diff --git a/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
index f9ca7eb7c1..849537e032 100644
--- a/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
+++ b/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
@@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 ---
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -123,6 +123,12 @@
+@@ -103,6 +103,12 @@
  		#address-cells = <1>;
  		#size-cells = <0>;
  
diff --git a/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch
index 0bbf3635b0..44ed519e0b 100644
--- a/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch
+++ b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch
@@ -57,15 +57,18 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +};
 --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
 +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-@@ -127,3 +127,8 @@
- 		};
+@@ -108,6 +108,11 @@
  	};
  };
-+
+ 
 +&uart0 {
 +	status = "okay";
 +	clock-frequency = <125000000>;
 +};
++
+ &usb2 {
+ 	vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
+ };
 --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 @@ -96,3 +96,7 @@
@@ -88,15 +91,17 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +};
 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -144,3 +144,8 @@
- 		};
+@@ -145,6 +145,10 @@
  	};
  };
-+
+ 
 +&uart0 {
 +	status = "okay";
 +	clock-frequency = <125000000>;
 +};
+ 
+ &usb2 {
+ 	vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
 --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 @@ -104,4 +104,5 @@
diff --git a/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-duplicated-NAND-entries-for-bcm_nand.patch b/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-duplicated-NAND-entries-for-bcm_nand.patch
index 9c41675411..9c1015f311 100644
--- a/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-duplicated-NAND-entries-for-bcm_nand.patch
+++ b/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-duplicated-NAND-entries-for-bcm_nand.patch
@@ -12,8 +12,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 ---
 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
 +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
-@@ -34,6 +34,18 @@
- 		};
+@@ -24,6 +24,18 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	axi@18000000 {
diff --git a/target/linux/bcm53xx/patches-3.18/353-ARM-BCM5301X-Fix-fixed-clock-frequency-for-some-devi.patch b/target/linux/bcm53xx/patches-3.18/353-ARM-BCM5301X-Fix-fixed-clock-frequency-for-some-devi.patch
index 2cd2a4b52d..c0ad9b87ce 100644
--- a/target/linux/bcm53xx/patches-3.18/353-ARM-BCM5301X-Fix-fixed-clock-frequency-for-some-devi.patch
+++ b/target/linux/bcm53xx/patches-3.18/353-ARM-BCM5301X-Fix-fixed-clock-frequency-for-some-devi.patch
@@ -24,9 +24,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +		};
 +	};
 +
- 	axi@18000000 {
- 		usb2@21000 {
- 			reg = <0x00021000 0x1000>;
+ 	leds {
+ 		compatible = "gpio-leds";
+ 
 --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
 +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
 @@ -25,6 +25,12 @@