From b4ecf19faa55ac21f86b8d7e435593af6a82a654 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 13 May 2015 20:01:03 +0000
Subject: [PATCH] bcm53xx: replace DT patches with backports from stblinux
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

SVN-Revision: 45685
---
 ...Add-USB-LED-for-Buffalo-WZR-1750DHP.patch} |  13 +-
 ...301X-Add-DT-for-Buffalo-WXR-1900DHP.patch} | 106 ++++++------
 ...-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch | 156 ++++++++++++++++++
 ...M-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch} |  15 +-
 ...M-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch} |  17 +-
 ...Enable-earlyprintk-on-tested-devices.patch |  11 ++
 ...cify-RAM-on-devices-by-including-HIG.patch |  12 ++
 ...-Buffalo-WXR-1900DHP-clock-and-USB-p.patch |  46 ++++++
 ...RM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch |   4 +-
 ...nable-ChipCommon-UART-serial-console.patch |  21 +++
 10 files changed, 329 insertions(+), 72 deletions(-)
 rename target/linux/bcm53xx/patches-3.18/{331-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch => 058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch} (54%)
 rename target/linux/bcm53xx/patches-3.18/{330-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch => 059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch} (73%)
 create mode 100644 target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch
 rename target/linux/bcm53xx/patches-3.18/{133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch => 061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch} (84%)
 rename target/linux/bcm53xx/patches-3.18/{134-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch => 062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch} (87%)
 create mode 100644 target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch

diff --git a/target/linux/bcm53xx/patches-3.18/331-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
similarity index 54%
rename from target/linux/bcm53xx/patches-3.18/331-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
rename to target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
index 18dd4d9270..6ba241b216 100644
--- a/target/linux/bcm53xx/patches-3.18/331-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
+++ b/target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch
@@ -1,11 +1,19 @@
+From 35ad0e50bd6683c6699586e3bd5045f0695586d9 Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@openwrt.org>
+Date: Wed, 13 May 2015 09:10:51 +0200
 Subject: [PATCH] ARM: BCM5301X: Add USB LED for Buffalo WZR-1750DHP
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+index b359c1e..78e95c0 100644
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -48,6 +48,12 @@
+@@ -47,6 +47,12 @@
  	leds {
  		compatible = "gpio-leds";
  
@@ -18,3 +26,6 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  		power0 {
  			label = "bcm53xx:red:power";
  			gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
+-- 
+1.8.4.5
+
diff --git a/target/linux/bcm53xx/patches-3.18/330-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch b/target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
similarity index 73%
rename from target/linux/bcm53xx/patches-3.18/330-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
rename to target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
index 2fa2dd95d9..363a3abe3c 100644
--- a/target/linux/bcm53xx/patches-3.18/330-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
+++ b/target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch
@@ -1,19 +1,42 @@
+From 35eecd10ee57b9d4f31e12598296b235ed2b34ae Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@openwrt.org>
+Date: Wed, 13 May 2015 09:10:52 +0200
 Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WXR-1900DHP
 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>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
+ arch/arm/boot/dts/Makefile                        |   1 +
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 127 ++++++++++++++++++++++
+ 2 files changed, 128 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 86217db..d34785a 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -62,6 +62,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm47081-asus-rt-n18u.dtb \
+ 	bcm47081-buffalo-wzr-600dhp2.dtb \
+ 	bcm47081-buffalo-wzr-900dhp.dtb \
++	bcm4709-buffalo-wxr-1900dhp.dtb \
+ 	bcm4709-netgear-r8000.dtb
+ dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
+ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
+diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+new file mode 100644
+index 0000000..548e93b
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -0,0 +1,158 @@
+@@ -0,0 +1,127 @@
 +/*
 + * Broadcom BCM470X / BCM5301X ARM platform code.
 + * DTS for Buffalo WXR-1900DHP
 + *
-+ * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
 + * Copyright (C) 2015 Felix Fietkau <nbd@openwrt.org>
 + *
 + * Licensed under the GNU/GPL. See COPYING for details.
@@ -25,33 +48,14 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +
 +/ {
 +	compatible = "buffalo,wxr-1900dhp", "brcm,bcm4709", "brcm,bcm4708";
-+	model = "Buffalo WXR-1900DHP (BCM4709)";
++	model = "Buffalo WXR-1900DHP";
 +
 +	chosen {
-+		bootargs = "console=ttyS0,115200 earlyprintk";
++		bootargs = "console=ttyS0,115200";
 +	};
 +
 +	memory {
-+		reg = <0x00000000 0x08000000
-+		       0x88000000 0x18000000>;
-+	};
-+
-+	chipcommonA {
-+		uart0: serial@0300 {
-+			status = "okay";
-+			clock-frequency = <125000000>;
-+		};
-+
-+		uart1: serial@0400 {
-+			status = "okay";
-+			clock-frequency = <125000000>;
-+		};
-+	};
-+
-+	clocks {
-+		clk_periph: periph {
-+			clock-frequency = <500000000>;
-+		};
++		reg = <0x00000000 0x08000000>;
 +	};
 +
 +	leds {
@@ -63,63 +67,52 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +			linux,default-trigger = "default-off";
 +		};
 +
-+		power0 {
++		power-amber {
 +			label = "bcm53xx:amber:power";
 +			gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "default-off";
 +		};
 +
-+		power1 {
++		power-white {
 +			label = "bcm53xx:white:power";
 +			gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "default-on";
 +		};
 +
-+		router0 {
-+			label = "bcm53xx:white:router";
-+			gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "default-off";
-+		};
-+
-+		router1 {
++		router-amber {
 +			label = "bcm53xx:amber:router";
 +			gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "default-off";
 +		};
 +
-+		wan0 {
-+			label = "bcm53xx:white:wan";
-+			gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
++		router-white {
++			label = "bcm53xx:white:router";
++			gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "default-off";
 +		};
 +
-+		wan1 {
++		wan-amber {
 +			label = "bcm53xx:amber:wan";
 +			gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "default-off";
 +		};
 +
-+		wireless0 {
-+			label = "bcm53xx:white:wireless";
-+			gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
++		wan-white {
++			label = "bcm53xx:white:wan";
++			gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "default-off";
 +		};
 +
-+		wireless1 {
++		wireless-amber {
 +			label = "bcm53xx:amber:wireless";
 +			gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "default-off";
 +		};
-+	};
-+
-+	axi@18000000 {
-+		usb2@21000 {
-+			reg = <0x00021000 0x1000>;
 +
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
++		wireless-white {
++			label = "bcm53xx:white:wireless";
++			gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
 +		};
 +	};
 +
@@ -167,13 +160,6 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 +		};
 +	};
 +};
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -64,6 +64,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
- 	bcm47081-asus-rt-n18u.dtb \
- 	bcm47081-buffalo-wzr-600dhp2.dtb \
- 	bcm47081-buffalo-wzr-900dhp.dtb \
-+	bcm4709-buffalo-wxr-1900dhp.dtb \
- 	bcm4709-asus-rt-ac87u.dtb \
- 	bcm4709-netgear-r8000.dtb
- dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
+-- 
+1.8.4.5
+
diff --git a/target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch b/target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch
new file mode 100644
index 0000000000..3edac1e1ab
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/060-ARM-BCM5301X-Add-DT-for-SmartRG-SR400ac.patch
@@ -0,0 +1,156 @@
+From 691917f20cae813d242f7123a4dc97e7d48e6ff1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Wed, 13 May 2015 09:10:53 +0200
+Subject: [PATCH] ARM: BCM5301X: Add DT for SmartRG SR400ac
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 119 ++++++++++++++++++++++++++
+ 2 files changed, 120 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index d34785a..59f7970 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -59,6 +59,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm4708-luxul-xwc-1000.dtb \
+ 	bcm4708-netgear-r6250.dtb \
+ 	bcm4708-netgear-r6300-v2.dtb \
++	bcm4708-smartrg-sr400ac.dtb \
+ 	bcm47081-asus-rt-n18u.dtb \
+ 	bcm47081-buffalo-wzr-600dhp2.dtb \
+ 	bcm47081-buffalo-wzr-900dhp.dtb \
+diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+new file mode 100644
+index 0000000..66dfb53
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+@@ -0,0 +1,119 @@
++/*
++ * Broadcom BCM470X / BCM5301X arm platform code.
++ * DTS for SmartRG SR400ac
++ *
++ * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++/dts-v1/;
++
++#include "bcm4708.dtsi"
++
++/ {
++	compatible = "smartrg,sr400ac", "brcm,bcm4708";
++	model = "SmartRG SR400ac";
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	memory {
++		reg = <0x00000000 0x08000000>;
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		power-white {
++			label = "bcm53xx:white:power";
++			gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-on";
++		};
++
++		power-amber {
++			label = "bcm53xx:amber:power";
++			gpios = <&chipcommon 2 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		usb2 {
++			label = "bcm53xx:white:usb2";
++			gpios = <&chipcommon 3 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		usb3-white {
++			label = "bcm53xx:white:usb3";
++			gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		usb3-green {
++			label = "bcm53xx:green:usb3";
++			gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		wps {
++			label = "bcm53xx:white:wps";
++			gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		status-red {
++			label = "bcm53xx:red:status";
++			gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		status-green {
++			label = "bcm53xx:green:status";
++			gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		status-blue {
++			label = "bcm53xx:blue:status";
++			gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		wan-white {
++			label = "bcm53xx:white:wan";
++			gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++
++		wan-red {
++			label = "bcm53xx:red:wan";
++			gpios = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-off";
++		};
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		rfkill {
++			label = "WiFi";
++			linux,code = <KEY_RFKILL>;
++			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
++		};
++
++		wps {
++			label = "WPS";
++			linux,code = <KEY_WPS_BUTTON>;
++			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
++		};
++
++		restart {
++			label = "Reset";
++			linux,code = <KEY_RESTART>;
++			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
++		};
++	};
++};
+-- 
+1.8.4.5
+
diff --git a/target/linux/bcm53xx/patches-3.18/133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch b/target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
similarity index 84%
rename from target/linux/bcm53xx/patches-3.18/133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
rename to target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
index 180c75d4f1..618a2cdaab 100644
--- a/target/linux/bcm53xx/patches-3.18/133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
+++ b/target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch
@@ -1,18 +1,21 @@
-From c2ebc30d9633d80849e99f489497e4c862e532e5 Mon Sep 17 00:00:00 2001
+From b5f350c790ae6aaf3dda5a825d7e3fdeed731164 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Sat, 28 Mar 2015 14:51:08 +0100
-Subject: [PATCH V2] ARM: BCM5301X: Add DT for Asus RT-AC68U
+Date: Sat, 28 Mar 2015 15:01:38 +0100
+Subject: [PATCH] ARM: BCM5301X: Add DT for Asus RT-AC68U
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
  arch/arm/boot/dts/Makefile                  |  1 +
  arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 83 +++++++++++++++++++++++++++++
  2 files changed, 84 insertions(+)
  create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
 
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 59f7970..1e8b8b7 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.
@@ -23,6 +26,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  	bcm4708-buffalo-wzr-1750dhp.dtb \
  	bcm4708-luxul-xwc-1000.dtb \
  	bcm4708-netgear-r6250.dtb \
+diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+new file mode 100644
+index 0000000..8b62836
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
 @@ -0,0 +1,83 @@
@@ -109,3 +115,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +		};
 +	};
 +};
+-- 
+1.8.4.5
+
diff --git a/target/linux/bcm53xx/patches-3.18/134-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch b/target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
similarity index 87%
rename from target/linux/bcm53xx/patches-3.18/134-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
rename to target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
index 7ed7579823..12809ff232 100644
--- a/target/linux/bcm53xx/patches-3.18/134-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
+++ b/target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch
@@ -1,22 +1,21 @@
-From 97734a031475d5a7e8788435f8ce8374c459ef93 Mon Sep 17 00:00:00 2001
+From 16dc3bac722252a10e396546f44135ae1b6a7ff3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Tue, 31 Mar 2015 17:26:17 +0200
+Date: Tue, 31 Mar 2015 17:29:18 +0200
 Subject: [PATCH] ARM: BCM5301X: Add DT for Asus RT-AC56U
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
-This patch is based on top of
-ARM: BCM5301X: Add DT for Asus RT-AC68U
-(please follow this order, to avoid Makefile conflict)
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
  arch/arm/boot/dts/Makefile                  |  1 +
  arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 96 +++++++++++++++++++++++++++++
  2 files changed, 97 insertions(+)
  create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 1e8b8b7..4802376 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.
@@ -27,6 +26,9 @@ ARM: BCM5301X: Add DT for Asus RT-AC68U
  	bcm4708-asus-rt-ac68u.dtb \
  	bcm4708-buffalo-wzr-1750dhp.dtb \
  	bcm4708-luxul-xwc-1000.dtb \
+diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+new file mode 100644
+index 0000000..71cff8d
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 @@ -0,0 +1,96 @@
@@ -126,3 +128,6 @@ ARM: BCM5301X: Add DT for Asus RT-AC68U
 +		};
 +	};
 +};
+-- 
+1.8.4.5
+
diff --git a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch
index 46d8855463..2153452dd4 100644
--- a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch
+++ b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch
@@ -112,4 +112,15 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +		bootargs = "console=ttyS0,115200 earlyprintk";
  	};
  
+ 	memory {
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -16,7 +16,7 @@
+ 	model = "Buffalo WXR-1900DHP";
+ 
+ 	chosen {
+-		bootargs = "console=ttyS0,115200";
++		bootargs = "console=ttyS0,115200 earlyprintk";
+ 	};
+ 
  	memory {
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 a806b28c17..f7bdf65563 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
@@ -122,4 +122,16 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +		       0x88000000 0x08000000>;
  	};
  
+ 	leds {
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -20,7 +20,8 @@
+ 	};
+ 
+ 	memory {
+-		reg = <0x00000000 0x08000000>;
++		reg = <0x00000000 0x08000000
++		       0x88000000 0x18000000>;
+ 	};
+ 
  	leds {
diff --git a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch
new file mode 100644
index 0000000000..4eaf5a7068
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch
@@ -0,0 +1,46 @@
+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(+)
+
+diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+index 4b02a0b..2c691a8 100644
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -24,6 +24,23 @@
+ 		       0x88000000 0x18000000>;
+ 	};
+ 
++	clocks {
++		clk_periph: periph {
++			clock-frequency = <500000000>;
++		};
++	};
++
++	axi@18000000 {
++		usb2@21000 {
++			reg = <0x00021000 0x1000>;
++
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
+ 	leds {
+ 		compatible = "gpio-leds";
+ 
+-- 
+1.8.4.5
+
diff --git a/target/linux/bcm53xx/patches-3.18/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch b/target/linux/bcm53xx/patches-3.18/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch
index 6b074059a1..582ebba79d 100644
--- a/target/linux/bcm53xx/patches-3.18/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch
+++ b/target/linux/bcm53xx/patches-3.18/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch
@@ -15,14 +15,14 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -64,6 +64,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -65,6 +65,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
  	bcm47081-asus-rt-n18u.dtb \
  	bcm47081-buffalo-wzr-600dhp2.dtb \
  	bcm47081-buffalo-wzr-900dhp.dtb \
 +	bcm4709-asus-rt-ac87u.dtb \
+ 	bcm4709-buffalo-wxr-1900dhp.dtb \
  	bcm4709-netgear-r8000.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
- dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
 @@ -0,0 +1,44 @@
diff --git a/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
index 8a6353474f..b50b5ac1a6 100644
--- a/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
+++ b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
@@ -187,3 +187,24 @@ 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,18 @@
+ 		       0x88000000 0x18000000>;
+ 	};
+ 
++	chipcommonA {
++		uart0: serial@0300 {
++			status = "okay";
++			clock-frequency = <125000000>;
++		};
++
++		uart1: serial@0400 {
++			status = "okay";
++			clock-frequency = <125000000>;
++		};
++	};
++
+ 	clocks {
+ 		clk_periph: periph {
+ 			clock-frequency = <500000000>;
-- 
2.30.2