bcm53xx: use UART serial DT patch sent upstream
authorRafał Miłecki <zajec5@gmail.com>
Mon, 29 Jun 2015 06:48:08 +0000 (06:48 +0000)
committerRafał Miłecki <zajec5@gmail.com>
Mon, 29 Jun 2015 06:48:08 +0000 (06:48 +0000)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 46139

target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch
target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch

diff --git a/target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch b/target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-Enable-UART0-on-tested-devices.patch
new file mode 100644 (file)
index 0000000..9317aed
--- /dev/null
@@ -0,0 +1,92 @@
+From 7ad224b884d85e8df3339d0149c7e7c8c3ce058c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Sun, 28 Jun 2015 19:40:16 +0200
+Subject: [PATCH V2] ARM: BCM5301X: Enable UART0 on tested devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are two possible UARTs so we have (both of) them disabled by
+default. Override uart0 status on devices that were verified to use it.
+In case of Netgear R6250 also drop an old (and invalid) overwrite. It
+doesn't have uart1 connected.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+V2: Drop old overwrite on R6250
+---
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  |  4 ++++
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts       |  4 ++++
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts        | 14 ++++----------
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts      |  4 ++++
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts |  4 ++++
+ 5 files changed, 20 insertions(+), 10 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -135,3 +135,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -55,3 +55,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -24,16 +24,6 @@
+               reg = <0x00000000 0x08000000>;
+       };
+-      chipcommonA {
+-              uart0: serial@0300 {
+-                      status = "okay";
+-              };
+-
+-              uart1: serial@0400 {
+-                      status = "okay";
+-              };
+-      };
+-
+       leds {
+               compatible = "gpio-leds";
+@@ -92,3 +82,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+@@ -118,3 +118,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -122,3 +122,7 @@
+               };
+       };
+ };
++
++&uart0 {
++      status = "okay";
++};
index 6637a62adcdb343cb284ace08718bd9457b31ade..5a63601fa123ba481c03212013015ac07877bf19 100644 (file)
@@ -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 @@
index 995da1f33351ad7e2ed580d8b9f461e7650c0a3f..9cb92b4ddb5fd0f791a83e7b889d79fc72e730c0 100644 (file)
@@ -47,8 +47,8 @@ diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm
 index d8ccc70..a05b8c2 100644
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -35,6 +35,17 @@
-               };
+@@ -25,6 +25,17 @@
+                      0x88000000 0x08000000>;
        };
  
 +      axi@18000000 {
index 87065de48a80a388a328516730139ba7efd01e7e..1fc0576b58e01d2a02cef3adba4f910bb6b2ceb5 100644 (file)
@@ -14,25 +14,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 10 ++++++++++
  4 files changed, 40 insertions(+)
 
---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x18000000>;
-       };
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       axi@18000000 {
-               usb2@21000 {
-                       reg = <0x00021000 0x1000>;
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 @@ -25,6 +25,16 @@
@@ -71,44 +52,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
        leds {
                compatible = "gpio-leds";
  
---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x08000000>;
-       };
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       spi {
-               compatible = "spi-gpio";
-               num-chipselects = <1>;
---- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
-+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
-@@ -23,6 +23,16 @@
-       memory {
-               reg = <0x00000000 0x08000000>;
-       };
-+ 
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-       nand: nand@18028000 {
-               nandcs@0 {
 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
 @@ -25,6 +25,16 @@
@@ -229,22 +172,3 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
        clocks {
                clk_periph: periph {
                        clock-frequency = <500000000>;
---- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
-+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
-@@ -25,6 +25,16 @@
-                      0x88000000 0x08000000>;
-       };
-+      chipcommonA {
-+              uart0: serial@0300 {
-+                      status = "okay";
-+              };
-+
-+              uart1: serial@0400 {
-+                      status = "okay";
-+              };
-+      };
-+
-       leds {
-               compatible = "gpio-leds";
index df65e0d03d7d124801460ee83109db03c21542d3..c3eae417c988c3f176d501aa9a2b71833b1117da 100644 (file)
@@ -16,8 +16,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 {