bcm53xx: rework patch enabling UART support

Follow upstream patch and handle it using &uart0. Also disable &uart1 as
it's most likely unused. This will allow us to get valuable reports and
upstream these changes.

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

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
new file mode 100644 (file)
index 0000000..2c17e88
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch
@@ -0,0 +1,103 @@
+From b49d7bb4825654f81bcee8e219028712811515a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Mon, 29 Jun 2015 08:11:36 +0200
+Subject: [PATCH] ARM: BCM5301X: Enable ChipCommon UART on untested devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+---
+ arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts       | 4 ++++
+ arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts       | 4 ++++
+ arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts    | 4 ++++
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts       | 4 ++++
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 ++++
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts       | 5 +++++
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 5 +++++
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts       | 5 +++++
+ 8 files changed, 35 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+@@ -96,3 +96,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+@@ -83,3 +83,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+@@ -83,3 +83,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+@@ -77,3 +77,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+@@ -37,3 +37,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -64,3 +64,8 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++      clock-frequency = <125000000>;
++};
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -144,3 +144,8 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++      clock-frequency = <125000000>;
++};
+--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+@@ -77,3 +77,8 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++      clock-frequency = <125000000>;
++};

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
deleted file mode 100644 (file)
index 1fc0576..0000000
--- a/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 6c223da976a9225ba9fae8d6f891a8fffaae6092 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Fri, 5 Dec 2014 17:38:40 +0100
-Subject: [PATCH] ARM: BCM5301X: Enable ChipCommon UART (serial console)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  | 10 ++++++++++
- arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts     | 10 ++++++++++
- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts        | 10 ++++++++++
- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 10 ++++++++++
- 4 files changed, 40 insertions(+)
-
---- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x08000000>;
-       };
- 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       leds {
-               compatible = "gpio-leds";
- 
---- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x08000000>;
-       };
- 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       leds {
-               compatible = "gpio-leds";
- 
---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
-+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x08000000>;
-       };
- 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       gpio-keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
---- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-@@ -46,6 +46,18 @@
-               };
-       };
- 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+                      clock-frequency = <125000000>;
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+                      clock-frequency = <125000000>;
-+              };
-+      };
-+
-       gpio-keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
---- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-@@ -25,6 +25,18 @@
-                      0x88000000 0x08000000>;
-       };
- 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+                      clock-frequency = <125000000>;
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+                      clock-frequency = <125000000>;
-+              };
-+      };
-+
-       leds {
-               compatible = "gpio-leds";
- 
---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
-+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x08000000>;
-       };
- 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       leds {
-               compatible = "gpio-leds";
- 
---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
-+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x08000000>;
-       };
- 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       leds {
-               compatible = "gpio-leds";
- 
---- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -25,6 +25,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>;