bcm53xx: backport BCM5301X earlycon and USB VCC patches

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49166 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/bcm53xx/patches-4.4/034-ARM-BCM5301X-Add-DT-for-D-Link-DIR-885L.patch b/target/linux/bcm53xx/patches-4.4/034-ARM-BCM5301X-Add-DT-for-D-Link-DIR-885L.patch
new file mode 100644 (file)
index 0000000..eee48f8
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/034-ARM-BCM5301X-Add-DT-for-D-Link-DIR-885L.patch
@@ -0,0 +1,141 @@
+From 3ea03a9d512ca19d59315492230e954a1653ff6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Tue, 26 Jan 2016 23:35:16 +0100
+Subject: [PATCH] ARM: BCM5301X: Add DT for D-Link DIR-885L
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It's device based on BCM47094 which is quite similar to BCM4709 except
+for higher CPU frequency. This device has 2 flash memories, it boots
+from serial one and stores firmware on NAND. Other than that we define
+standard stuff like LEDs, buttons and UART.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -76,6 +76,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+       bcm4709-buffalo-wxr-1900dhp.dtb \
+       bcm4709-netgear-r7000.dtb \
+       bcm4709-netgear-r8000.dtb \
++      bcm47094-dlink-dir-885l.dtb \
+       bcm94708.dtb \
+       bcm94709.dtb \
+       bcm953012k.dtb
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -0,0 +1,111 @@
++/*
++ * Broadcom BCM470X / BCM5301X ARM platform code.
++ * DTS for D-Link DIR-885L
++ *
++ * Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++/dts-v1/;
++
++#include "bcm4708.dtsi"
++#include "bcm5301x-nand-cs0-bch8.dtsi"
++
++/ {
++      compatible = "dlink,dir-885l", "brcm,bcm47094", "brcm,bcm4708";
++      model = "D-Link DIR-885L";
++
++      chosen {
++              bootargs = "console=ttyS0,115200";
++      };
++
++      memory {
++              reg = <0x00000000 0x08000000>;
++      };
++
++      nand: nand@18028000 {
++              nandcs@0 {
++                      partition@0 {
++                              label = "firmware";
++                              reg = <0x00000000 0x08000000>;
++                      };
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              power-white {
++                      label = "bcm53xx:white:power";
++                      gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "default-on";
++              };
++
++              wan-white {
++                      label = "bcm53xx:white:wan";
++                      gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "default-off";
++              };
++
++              power-amber {
++                      label = "bcm53xx:amber:power";
++                      gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wan-amber {
++                      label = "bcm53xx:amber:wan";
++                      gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "default-off";
++              };
++
++              usb3-white {
++                      label = "bcm53xx:white:usb3";
++                      gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "default-off";
++              };
++
++              2ghz {
++                      label = "bcm53xx:white:2ghz";
++                      gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "default-off";
++              };
++
++              5ghz {
++                      label = "bcm53xx:white:5ghz";
++                      gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "default-off";
++              };
++      };
++
++      gpio-keys {
++              compatible = "gpio-keys";
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              wps {
++                      label = "WPS";
++                      linux,code = <KEY_WPS_BUTTON>;
++                      gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
++              };
++
++              /* Switch: router / extender */
++              extender {
++                      label = "Extender";
++                      linux,code = <BTN_0>;
++                      gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
++              };
++
++              restart {
++                      label = "Reset";
++                      linux,code = <KEY_RESTART>;
++                      gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
++              };
++      };
++};
++
++&uart0 {
++      status = "okay";
++      clock-frequency = <125000000>;
++};

diff --git a/target/linux/bcm53xx/patches-4.4/035-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers-of-few.patch b/target/linux/bcm53xx/patches-4.4/035-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers-of-few.patch
new file mode 100644 (file)
index 0000000..3a32c8b
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/035-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
+@@ -207,6 +207,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>;
++              };
+       };
+ 
+       lcpll0: lcpll0@1800c100 {

diff --git a/target/linux/bcm53xx/patches-4.4/036-ARM-BCM5301X-Enable-earlycon-on-tested-devices.patch b/target/linux/bcm53xx/patches-4.4/036-ARM-BCM5301X-Enable-earlycon-on-tested-devices.patch
new file mode 100644 (file)
index 0000000..abcb00f
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/036-ARM-BCM5301X-Enable-earlycon-on-tested-devices.patch
@@ -0,0 +1,95 @@
+From 5a6516ff135555aa53c7d156cd3973b826e011f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Wed, 6 Apr 2016 18:49:55 +0200
+Subject: [PATCH] ARM: BCM5301X: Enable earlycon on tested devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows reporting & debugging problems occurring early in the boot
+process.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
+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
+@@ -17,7 +17,7 @@
+       model = "Buffalo WZR-1750DHP (BCM4708)";
+ 
+       chosen {
+-              bootargs = "console=ttyS0,115200";
++              bootargs = "console=ttyS0,115200 earlycon";
+       };
+ 
+       memory {
+--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -17,7 +17,7 @@
+       model = "Luxul XWC-1000 (BCM4708)";
+ 
+       chosen {
+-              bootargs = "console=ttyS0,115200";
++              bootargs = "console=ttyS0,115200 earlycon";
+       };
+ 
+       memory {
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -17,7 +17,7 @@
+       model = "Netgear R6250 V1 (BCM4708)";
+ 
+       chosen {
+-              bootargs = "console=ttyS0,115200";
++              bootargs = "console=ttyS0,115200 earlycon";
+       };
+ 
+       memory {
+--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+@@ -17,7 +17,7 @@
+       model = "SmartRG SR400ac";
+ 
+       chosen {
+-              bootargs = "console=ttyS0,115200";
++              bootargs = "console=ttyS0,115200 earlycon";
+       };
+ 
+       memory {
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -17,7 +17,7 @@
+       model = "Buffalo WZR-600DHP2 (BCM47081)";
+ 
+       chosen {
+-              bootargs = "console=ttyS0,115200";
++              bootargs = "console=ttyS0,115200 earlycon";
+       };
+ 
+       memory {
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -17,7 +17,7 @@
+       model = "D-Link DIR-885L";
+ 
+       chosen {
+-              bootargs = "console=ttyS0,115200";
++              bootargs = "console=ttyS0,115200 earlycon";
+       };
+ 
+       memory {
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -18,6 +18,10 @@
+ / {
+       interrupt-parent = <&gic>;
+ 
++      chosen {
++              stdout-path = &uart0;
++      };
++
+       chipcommonA {
+               compatible = "simple-bus";
+               ranges = <0x00000000 0x18000000 0x00001000>;

diff --git a/target/linux/bcm53xx/patches-4.4/130-ARM-BCM5301X-Add-DT-for-D-Link-DIR-885L.patch b/target/linux/bcm53xx/patches-4.4/130-ARM-BCM5301X-Add-DT-for-D-Link-DIR-885L.patch
deleted file mode 100644 (file)
index c606e93..0000000
--- a/target/linux/bcm53xx/patches-4.4/130-ARM-BCM5301X-Add-DT-for-D-Link-DIR-885L.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 3ea03a9d512ca19d59315492230e954a1653ff6e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Tue, 26 Jan 2016 23:35:16 +0100
-Subject: [PATCH] ARM: BCM5301X: Add DT for D-Link DIR-885L
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's device based on BCM47094 which is quite similar to BCM4709 except
-for higher CPU frequency. This device has 2 flash memories, it boots
-from serial one and stores firmware on NAND. Other than that we define
-standard stuff like LEDs, buttons and UART.
-
-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/bcm47094-dlink-dir-885l.dts | 111 ++++++++++++++++++++++++++
- 2 files changed, 112 insertions(+)
- create mode 100644 arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -76,6 +76,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
-       bcm4709-buffalo-wxr-1900dhp.dtb \
-       bcm4709-netgear-r7000.dtb \
-       bcm4709-netgear-r8000.dtb \
-+      bcm47094-dlink-dir-885l.dtb \
-       bcm94708.dtb \
-       bcm94709.dtb \
-       bcm953012k.dtb
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-@@ -0,0 +1,111 @@
-+/*
-+ * Broadcom BCM470X / BCM5301X ARM platform code.
-+ * DTS for D-Link DIR-885L
-+ *
-+ * Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+/dts-v1/;
-+
-+#include "bcm4708.dtsi"
-+#include "bcm5301x-nand-cs0-bch8.dtsi"
-+
-+/ {
-+      compatible = "dlink,dir-885l", "brcm,bcm47094", "brcm,bcm4708";
-+      model = "D-Link DIR-885L";
-+
-+      chosen {
-+              bootargs = "console=ttyS0,115200";
-+      };
-+
-+      memory {
-+              reg = <0x00000000 0x08000000>;
-+      };
-+
-+      nand: nand@18028000 {
-+              nandcs@0 {
-+                      partition@0 {
-+                              label = "firmware";
-+                              reg = <0x00000000 0x08000000>;
-+                      };
-+              };
-+      };
-+
-+      leds {
-+              compatible = "gpio-leds";
-+
-+              power-white {
-+                      label = "bcm53xx:white:power";
-+                      gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              wan-white {
-+                      label = "bcm53xx:white:wan";
-+                      gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              power-amber {
-+                      label = "bcm53xx:amber:power";
-+                      gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wan-amber {
-+                      label = "bcm53xx:amber:wan";
-+                      gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              usb3-white {
-+                      label = "bcm53xx:white:usb3";
-+                      gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              2ghz {
-+                      label = "bcm53xx:white:2ghz";
-+                      gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              5ghz {
-+                      label = "bcm53xx:white:5ghz";
-+                      gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
-+                      linux,default-trigger = "default-off";
-+              };
-+      };
-+
-+      gpio-keys {
-+              compatible = "gpio-keys";
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              wps {
-+                      label = "WPS";
-+                      linux,code = <KEY_WPS_BUTTON>;
-+                      gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              /* Switch: router / extender */
-+              extender {
-+                      label = "Extender";
-+                      linux,code = <BTN_0>;
-+                      gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              restart {
-+                      label = "Reset";
-+                      linux,code = <KEY_RESTART>;
-+                      gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+};
-+
-+&uart0 {
-+      status = "okay";
-+      clock-frequency = <125000000>;
-+};

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
deleted file mode 100644 (file)
index 32a9680..0000000
--- a/target/linux/bcm53xx/patches-4.4/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-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
-@@ -24,6 +24,26 @@
-               reg = <0x00000000 0x08000000>;
-       };
- 
-+      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
-@@ -24,6 +24,26 @@
-               reg = <0x00000000 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";
- 
---- 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/330-ARM-BCM5301X-Enable-earlyprintk-on-tested-devices.patch b/target/linux/bcm53xx/patches-4.4/330-ARM-BCM5301X-Enable-earlyprintk-on-tested-devices.patch
deleted file mode 100644 (file)
index b6c9eac..0000000
--- a/target/linux/bcm53xx/patches-4.4/330-ARM-BCM5301X-Enable-earlyprintk-on-tested-devices.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From eb1075cc48d3c315c7403822c33da9588ab76492 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 14 Jan 2015 08:33:25 +0100
-Subject: [PATCH] ARM: BCM5301X: Enable earlyprintk on tested 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-buffalo-wzr-1750dhp.dts  | 2 +-
- arch/arm/boot/dts/bcm4708-netgear-r6250.dts        | 2 +-
- arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts        | 2 +-
- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -17,7 +17,7 @@
-       model = "Buffalo WZR-1750DHP (BCM4708)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -17,7 +17,7 @@
-       model = "Netgear R6250 V1 (BCM4708)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -17,7 +17,7 @@
-       model = "Asus RT-N18U (BCM47081)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -17,7 +17,7 @@
-       model = "Buffalo WZR-600DHP2 (BCM47081)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
-+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
-@@ -17,7 +17,7 @@
-       model = "Buffalo WZR-900DHP (BCM47081)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-@@ -17,7 +17,7 @@
-       model = "Netgear R8000 (BCM4709)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
-+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
-@@ -17,7 +17,7 @@
-       model = "Asus RT-AC56U (BCM4708)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
-+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
-@@ -17,7 +17,7 @@
-       model = "Asus RT-AC68U (BCM4708)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
-+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
-@@ -17,7 +17,7 @@
-       model = "Luxul XWC-1000 (BCM4708)";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              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
-@@ -17,7 +17,7 @@
-       model = "Buffalo WXR-1900DHP";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
-+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
-@@ -17,7 +17,7 @@
-       model = "SmartRG SR400ac";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-@@ -17,7 +17,7 @@
-       model = "Asus RT-AC87U";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
-+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
-@@ -17,7 +17,7 @@
-       model = "Netgear R7000";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
-+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
-@@ -17,7 +17,7 @@
-       model = "Linksys EA6300 V1";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-@@ -17,7 +17,7 @@
-       model = "D-Link DIR-885L";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {
---- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
-+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
-@@ -17,7 +17,7 @@
-       model = "Netgear R8500";
- 
-       chosen {
--              bootargs = "console=ttyS0,115200";
-+              bootargs = "console=ttyS0,115200 earlyprintk";
-       };
- 
-       memory {

diff --git a/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch b/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
index b388318..f2e5a3e 100644 (file)
--- a/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
+++ b/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
@@ -26,7 +26,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +                     0x88000000 0x18000000>;
        };
  
-       axi@18000000 {
+       spi {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 @@ -21,7 +21,8 @@
@@ -38,7 +38,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +                     0x88000000 0x08000000>;
        };
  
-       axi@18000000 {
+       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 @@
@@ -98,7 +98,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +                     0x88000000 0x08000000>;
        };
  
-       axi@18000000 {
+       leds {
 --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
 @@ -21,7 +21,8 @@
@@ -134,7 +134,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +                     0x88000000 0x18000000>;
        };
  
-       axi@18000000 {
+       leds {
 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 @@ -21,7 +21,8 @@

diff --git a/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
index f9ca7eb..849537e 100644 (file)
--- a/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
+++ b/target/linux/bcm53xx/patches-4.4/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-4.4/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch b/target/linux/bcm53xx/patches-4.4/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch
index 240a74b..b5e92c1 100644 (file)
--- a/target/linux/bcm53xx/patches-4.4/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch
+++ b/target/linux/bcm53xx/patches-4.4/351-ARM-BCM5301X-Enable-ChipCommon-UART-on-untested-devi.patch
@@ -81,26 +81,31 @@ 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
-@@ -138,3 +138,8 @@
-               };
+@@ -128,6 +128,10 @@
        };
  };
-+
+ 
 +&uart0 {
 +      status = "okay";
 +      clock-frequency = <125000000>;
 +};
+ 
+ &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
-@@ -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/bcm4709-netgear-r7000.dts
 +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 @@ -104,4 +104,5 @@