bcm53xx: backport 3 BCM5301X patches from Hauke repo

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

diff --git a/target/linux/bcm53xx/patches-3.14/052-ARM-BCM5301X-Add-DT-for-Luxul-XWC-1000.patch b/target/linux/bcm53xx/patches-3.14/052-ARM-BCM5301X-Add-DT-for-Luxul-XWC-1000.patch
new file mode 100644 (file)
index 0000000..daa641f
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.14/052-ARM-BCM5301X-Add-DT-for-Luxul-XWC-1000.patch
@@ -0,0 +1,97 @@
+From 0da909663566b34e0294ab0ff1ea08908164811e Mon Sep 17 00:00:00 2001
+From: Dan Haab <dhaab@luxul.com>
+Date: Wed, 7 Jan 2015 14:34:50 -0700
+Subject: [PATCH 52/54] ARM: BCM5301X: Add DT for Luxul XWC-1000
+
+Luxul XWC-1000 is a controller device based on BCM4708 SoC. The only
+unusual thing in its DTS file is "ubi" partition on NAND flash.
+
+Signed-off-by: Dan Haab <dhaab@luxul.com>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm/boot/dts/Makefile                   |  1 +
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 60 ++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 91bd5bd..ff4a5ae 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -57,6 +57,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
+ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+       bcm4708-buffalo-wzr-1750dhp.dtb \
++      bcm4708-luxul-xwc-1000.dtb \
+       bcm4708-netgear-r6250.dtb \
+       bcm4708-netgear-r6300-v2.dtb \
+       bcm47081-asus-rt-n18u.dtb \
+diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+new file mode 100644
+index 0000000..946c728
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -0,0 +1,60 @@
++/*
++ * Broadcom BCM470X / BCM5301X ARM platform code.
++ * DTS for Luxul XWC-1000
++ *
++ * Copyright 2014 Luxul Inc.
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++/dts-v1/;
++
++#include "bcm4708.dtsi"
++
++/ {
++      compatible = "luxul,xwc-1000", "brcm,bcm4708";
++      model = "Luxul XWC-1000 (BCM4708)";
++
++      chosen {
++              bootargs = "console=ttyS0,115200";
++      };
++
++      memory {
++              reg = <0x00000000 0x08000000>;
++      };
++
++      axi@18000000 {
++              nand@28000 {
++                      reg = <0x00028000 0x1000>;
++                      #address-cells = <1>;
++                      #size-cells = <1>;
++
++                      partition@0 {
++                              label = "ubi";
++                              reg = <0x00000000 0x08000000>;
++                      };
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              status {
++                      label = "bcm53xx:green:status";
++                      gpios = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "timer";
++              };
++      };
++
++      gpio-keys {
++              compatible = "gpio-keys";
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              restart {
++                      label = "Reset";
++                      linux,code = <KEY_RESTART>;
++                      gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
++              };
++      };
++};
+-- 
+1.8.4.5
+

diff --git a/target/linux/bcm53xx/patches-3.14/053-ARM-BCM5301X-Drop-unused-poll-interval-from-gpio-key.patch b/target/linux/bcm53xx/patches-3.14/053-ARM-BCM5301X-Drop-unused-poll-interval-from-gpio-key.patch
new file mode 100644 (file)
index 0000000..87e9153
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.14/053-ARM-BCM5301X-Drop-unused-poll-interval-from-gpio-key.patch
@@ -0,0 +1,84 @@
+From b2c76541507c28fd93548c5639366d2149382b73 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:20:48 +0100
+Subject: [PATCH 53/54] ARM: BCM5301X: Drop unused poll-interval from gpio-keys
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It was accidentally left (& copied & pasted all around) from our
+experiments with gpio-keys-polled.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  | 1 -
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts        | 1 -
+ arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts     | 1 -
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts        | 1 -
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 1 -
+ 5 files changed, 5 deletions(-)
+
+diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+index 5fc0fae..13d51a9 100644
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -27,7 +27,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
+diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+index 4ed7de1..f18c9d9 100644
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -71,7 +71,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
+diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+index 12fc2a01..3991042 100644
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+@@ -61,7 +61,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
+diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+index fb76378..0ee85ea 100644
+--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+@@ -61,7 +61,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
+diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+index bbb414f..e23dbbf 100644
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -27,7 +27,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               aoss {
+                       label = "AOSS";
+-- 
+1.8.4.5
+

diff --git a/target/linux/bcm53xx/patches-3.14/054-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch b/target/linux/bcm53xx/patches-3.14/054-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
new file mode 100644 (file)
index 0000000..211e8e6
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.14/054-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
@@ -0,0 +1,174 @@
+From 766f8b55ba3f38dffc25a7dc0dd58502fd710f0a 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:20:49 +0100
+Subject: [PATCH 54/54] ARM: BCM5301X: Add LEDs for Buffalo 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>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  | 67 ++++++++++++++++++++++
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 67 ++++++++++++++++++++++
+ 2 files changed, 134 insertions(+)
+
+diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+index 13d51a9..b359c1e 100644
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -23,6 +23,73 @@
+               reg = <0x00000000 0x08000000>;
+       };
+ 
++      spi {
++              compatible = "spi-gpio";
++              num-chipselects = <1>;
++              gpio-sck = <&chipcommon 7 0>;
++              gpio-mosi = <&chipcommon 4 0>;
++              cs-gpios = <&chipcommon 6 0>;
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              hc595: gpio_spi@0 {
++                      compatible = "fairchild,74hc595";
++                      reg = <0>;
++                      registers-number = <1>;
++                      spi-max-frequency = <100000>;
++
++                      gpio-controller;
++                      #gpio-cells = <2>;
++
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              power0 {
++                      label = "bcm53xx:red:power";
++                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              power1 {
++                      label = "bcm53xx:white:power";
++                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              router0 {
++                      label = "bcm53xx:blue:router";
++                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              router1 {
++                      label = "bcm53xx:amber:router";
++                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wan {
++                      label = "bcm53xx:blue:wan";
++                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              wireless0 {
++                      label = "bcm53xx:blue:wireless";
++                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wireless1 {
++                      label = "bcm53xx:amber:wireless";
++                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++      };
++
+       gpio-keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+index e23dbbf..db9131e 100644
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -23,6 +23,73 @@
+               reg = <0x00000000 0x08000000>;
+       };
+ 
++      spi {
++              compatible = "spi-gpio";
++              num-chipselects = <1>;
++              gpio-sck = <&chipcommon 7 0>;
++              gpio-mosi = <&chipcommon 4 0>;
++              cs-gpios = <&chipcommon 6 0>;
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              hc595: gpio_spi@0 {
++                      compatible = "fairchild,74hc595";
++                      reg = <0>;
++                      registers-number = <1>;
++                      spi-max-frequency = <100000>;
++
++                      gpio-controller;
++                      #gpio-cells = <2>;
++
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              power0 {
++                      label = "bcm53xx:green:power";
++                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              power1 {
++                      label = "bcm53xx:red:power";
++                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              router0 {
++                      label = "bcm53xx:green:router";
++                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              router1 {
++                      label = "bcm53xx:amber:router";
++                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wan {
++                      label = "bcm53xx:green:wan";
++                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              wireless0 {
++                      label = "bcm53xx:green:wireless";
++                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wireless1 {
++                      label = "bcm53xx:amber:wireless";
++                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++      };
++
+       gpio-keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+-- 
+1.8.4.5
+

diff --git a/target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch b/target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
index b460d7f9786fe4de1a90413c2dd2b24cc0a4c674..13bec164f0e65b6cdbbdfeb36d8047d37e9ff7bf 100644 (file)
--- a/target/linux/bcm53xx/patches-3.14/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch
+++ b/target/linux/bcm53xx/patches-3.14/306-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>;
        };
  
-       gpio-keys {
+       spi {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 @@ -20,7 +20,8 @@
@@ -74,4 +74,4 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +                     0x88000000 0x08000000>;
        };
  
-       gpio-keys {
+       spi {

diff --git a/target/linux/bcm53xx/patches-3.14/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch b/target/linux/bcm53xx/patches-3.14/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch
index e494774ddfe1325e1578f7297c6df80780554e48..b0d0540c3c75090fbe91cd5a3047c113f4c60a84 100644 (file)
--- a/target/linux/bcm53xx/patches-3.14/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch
+++ b/target/linux/bcm53xx/patches-3.14/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch
@@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -55,7 +55,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -56,7 +56,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-netgear-r6250.dtb \
        bcm4708-netgear-r6300-v2.dtb \
        bcm47081-asus-rt-n18u.dtb \

diff --git a/target/linux/bcm53xx/patches-3.14/321-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch b/target/linux/bcm53xx/patches-3.14/321-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
deleted file mode 100644 (file)
index 7d91c77..0000000
--- a/target/linux/bcm53xx/patches-3.14/321-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From af26d75225f8b1295d4dec74b9a6a703d582fa40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 11 Dec 2014 12:13:49 +0100
-Subject: [PATCH] ARM: BCM5301X: Add LEDs for Buffalo 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  | 67 ++++++++++++++++++++++
- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 67 ++++++++++++++++++++++
- 2 files changed, 134 insertions(+)
-
---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -34,6 +34,73 @@
-               };
-       };
- 
-+      spi {
-+              compatible = "spi-gpio";
-+              num-chipselects = <1>;
-+              gpio-sck = <&chipcommon 7 0>;
-+              gpio-mosi = <&chipcommon 4 0>;
-+              cs-gpios = <&chipcommon 6 0>;
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              hc595: gpio_spi@0 {
-+                      compatible = "fairchild,74hc595";
-+                      reg = <0>;
-+                      registers-number = <1>;
-+                      spi-max-frequency = <100000>;
-+
-+                      gpio-controller;
-+                      #gpio-cells = <2>;
-+
-+              };
-+      };
-+
-+      leds {
-+              compatible = "gpio-leds";
-+
-+              power0 {
-+                      label = "bcm53xx:red:power";
-+                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              power1 {
-+                      label = "bcm53xx:white:power";
-+                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              router0 {
-+                      label = "bcm53xx:blue:router";
-+                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              router1 {
-+                      label = "bcm53xx:amber:router";
-+                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wan {
-+                      label = "bcm53xx:blue:wan";
-+                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              wireless0 {
-+                      label = "bcm53xx:blue:wireless";
-+                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wireless1 {
-+                      label = "bcm53xx:amber:wireless";
-+                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+      };
-+
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -34,6 +34,73 @@
-               };
-       };
- 
-+      spi {
-+              compatible = "spi-gpio";
-+              num-chipselects = <1>;
-+              gpio-sck = <&chipcommon 7 0>;
-+              gpio-mosi = <&chipcommon 4 0>;
-+              cs-gpios = <&chipcommon 6 0>;
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              hc595: gpio_spi@0 {
-+                      compatible = "fairchild,74hc595";
-+                      reg = <0>;
-+                      registers-number = <1>;
-+                      spi-max-frequency = <100000>;
-+
-+                      gpio-controller;
-+                      #gpio-cells = <2>;
-+
-+              };
-+      };
-+
-+      leds {
-+              compatible = "gpio-leds";
-+
-+              power0 {
-+                      label = "bcm53xx:green:power";
-+                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              power1 {
-+                      label = "bcm53xx:red:power";
-+                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              router0 {
-+                      label = "bcm53xx:green:router";
-+                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              router1 {
-+                      label = "bcm53xx:amber:router";
-+                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wan {
-+                      label = "bcm53xx:green:wan";
-+                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              wireless0 {
-+                      label = "bcm53xx:green:wireless";
-+                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wireless1 {
-+                      label = "bcm53xx:amber:wireless";
-+                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+      };
-+
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;

diff --git a/target/linux/bcm53xx/patches-3.14/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch b/target/linux/bcm53xx/patches-3.14/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch
index e750ee6e7701e187185f8a183b4aa305c2d923a5..54dd0d165b8d7a4defa21ac8a047e75580738c8d 100644 (file)
--- a/target/linux/bcm53xx/patches-3.14/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch
+++ b/target/linux/bcm53xx/patches-3.14/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch
@@ -62,7 +62,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +};
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -56,7 +56,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -57,7 +57,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-netgear-r6300-v2.dtb \
        bcm47081-asus-rt-n18u.dtb \
        bcm47081-buffalo-wzr-600dhp2.dtb \

diff --git a/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch b/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
index 8139ee676187ad415b2b6d01889f4adcea19ec60..cc0e75fd43450613d78e21951dbb3b04aafa3568 100644 (file)
--- a/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
+++ b/target/linux/bcm53xx/patches-3.14/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
@@ -19,7 +19,7 @@ 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
-@@ -92,7 +92,7 @@
+@@ -92,9 +92,10 @@
        };
  
        gpio-keys {
@@ -27,10 +27,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -69,7 +69,7 @@
+@@ -69,9 +69,10 @@
        };
  
        gpio-keys {
@@ -38,10 +41,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -59,7 +59,7 @@
+@@ -59,9 +59,10 @@
        };
  
        gpio-keys {
@@ -49,10 +55,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
 --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
 +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -59,7 +59,7 @@
+@@ -59,9 +59,10 @@
        };
  
        gpio-keys {
@@ -60,10 +69,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -92,7 +92,7 @@
+@@ -92,9 +92,10 @@
        };
  
        gpio-keys {
@@ -71,4 +83,21 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               aoss {
+                       label = "AOSS";
+--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -47,9 +47,10 @@
+       };
+ 
+       gpio-keys {
+-              compatible = "gpio-keys";
++              compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
++              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";

diff --git a/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch b/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
index 225a4ec9f86628e00ef28542c61b1c5ea0bbd180..ac8c77bdbc77ef3e2c6097df064d316c114e86fe 100644 (file)
--- a/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
+++ b/target/linux/bcm53xx/patches-3.14/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
@@ -73,8 +73,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -91,6 +91,16 @@
-               };
+@@ -24,6 +24,16 @@
+                      0x88000000 0x08000000>;
        };
  
 +      chipcommonA {
@@ -87,6 +87,25 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              };
 +      };
 +
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
+       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 @@
+               reg = <0x00000000 0x08000000>;
+       };
+ 
++      chipcommonA {
++              uart0: serial@0300 {
++                      status = "okay";
++              };
++
++              uart1: serial@0400 {
++                      status = "okay";
++              };
++      };
++
+       axi@18000000 {
+               nand@28000 {
+                       reg = <0x00028000 0x1000>;

diff --git a/target/linux/bcm53xx/patches-3.18/052-ARM-BCM5301X-Add-DT-for-Luxul-XWC-1000.patch b/target/linux/bcm53xx/patches-3.18/052-ARM-BCM5301X-Add-DT-for-Luxul-XWC-1000.patch
new file mode 100644 (file)
index 0000000..daa641f
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/052-ARM-BCM5301X-Add-DT-for-Luxul-XWC-1000.patch
@@ -0,0 +1,97 @@
+From 0da909663566b34e0294ab0ff1ea08908164811e Mon Sep 17 00:00:00 2001
+From: Dan Haab <dhaab@luxul.com>
+Date: Wed, 7 Jan 2015 14:34:50 -0700
+Subject: [PATCH 52/54] ARM: BCM5301X: Add DT for Luxul XWC-1000
+
+Luxul XWC-1000 is a controller device based on BCM4708 SoC. The only
+unusual thing in its DTS file is "ubi" partition on NAND flash.
+
+Signed-off-by: Dan Haab <dhaab@luxul.com>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm/boot/dts/Makefile                   |  1 +
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 60 ++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 91bd5bd..ff4a5ae 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -57,6 +57,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
+ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+       bcm4708-buffalo-wzr-1750dhp.dtb \
++      bcm4708-luxul-xwc-1000.dtb \
+       bcm4708-netgear-r6250.dtb \
+       bcm4708-netgear-r6300-v2.dtb \
+       bcm47081-asus-rt-n18u.dtb \
+diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+new file mode 100644
+index 0000000..946c728
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -0,0 +1,60 @@
++/*
++ * Broadcom BCM470X / BCM5301X ARM platform code.
++ * DTS for Luxul XWC-1000
++ *
++ * Copyright 2014 Luxul Inc.
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++/dts-v1/;
++
++#include "bcm4708.dtsi"
++
++/ {
++      compatible = "luxul,xwc-1000", "brcm,bcm4708";
++      model = "Luxul XWC-1000 (BCM4708)";
++
++      chosen {
++              bootargs = "console=ttyS0,115200";
++      };
++
++      memory {
++              reg = <0x00000000 0x08000000>;
++      };
++
++      axi@18000000 {
++              nand@28000 {
++                      reg = <0x00028000 0x1000>;
++                      #address-cells = <1>;
++                      #size-cells = <1>;
++
++                      partition@0 {
++                              label = "ubi";
++                              reg = <0x00000000 0x08000000>;
++                      };
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              status {
++                      label = "bcm53xx:green:status";
++                      gpios = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "timer";
++              };
++      };
++
++      gpio-keys {
++              compatible = "gpio-keys";
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              restart {
++                      label = "Reset";
++                      linux,code = <KEY_RESTART>;
++                      gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
++              };
++      };
++};
+-- 
+1.8.4.5
+

diff --git a/target/linux/bcm53xx/patches-3.18/053-ARM-BCM5301X-Drop-unused-poll-interval-from-gpio-key.patch b/target/linux/bcm53xx/patches-3.18/053-ARM-BCM5301X-Drop-unused-poll-interval-from-gpio-key.patch
new file mode 100644 (file)
index 0000000..87e9153
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/053-ARM-BCM5301X-Drop-unused-poll-interval-from-gpio-key.patch
@@ -0,0 +1,84 @@
+From b2c76541507c28fd93548c5639366d2149382b73 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:20:48 +0100
+Subject: [PATCH 53/54] ARM: BCM5301X: Drop unused poll-interval from gpio-keys
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It was accidentally left (& copied & pasted all around) from our
+experiments with gpio-keys-polled.
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  | 1 -
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts        | 1 -
+ arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts     | 1 -
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts        | 1 -
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 1 -
+ 5 files changed, 5 deletions(-)
+
+diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+index 5fc0fae..13d51a9 100644
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -27,7 +27,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
+diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+index 4ed7de1..f18c9d9 100644
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -71,7 +71,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
+diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+index 12fc2a01..3991042 100644
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+@@ -61,7 +61,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
+diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+index fb76378..0ee85ea 100644
+--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+@@ -61,7 +61,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
+diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+index bbb414f..e23dbbf 100644
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -27,7 +27,6 @@
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+-              poll-interval = <200>;
+ 
+               aoss {
+                       label = "AOSS";
+-- 
+1.8.4.5
+

diff --git a/target/linux/bcm53xx/patches-3.18/054-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch b/target/linux/bcm53xx/patches-3.18/054-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
new file mode 100644 (file)
index 0000000..211e8e6
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/054-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
@@ -0,0 +1,174 @@
+From 766f8b55ba3f38dffc25a7dc0dd58502fd710f0a 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:20:49 +0100
+Subject: [PATCH 54/54] ARM: BCM5301X: Add LEDs for Buffalo 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>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  | 67 ++++++++++++++++++++++
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 67 ++++++++++++++++++++++
+ 2 files changed, 134 insertions(+)
+
+diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+index 13d51a9..b359c1e 100644
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -23,6 +23,73 @@
+               reg = <0x00000000 0x08000000>;
+       };
+ 
++      spi {
++              compatible = "spi-gpio";
++              num-chipselects = <1>;
++              gpio-sck = <&chipcommon 7 0>;
++              gpio-mosi = <&chipcommon 4 0>;
++              cs-gpios = <&chipcommon 6 0>;
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              hc595: gpio_spi@0 {
++                      compatible = "fairchild,74hc595";
++                      reg = <0>;
++                      registers-number = <1>;
++                      spi-max-frequency = <100000>;
++
++                      gpio-controller;
++                      #gpio-cells = <2>;
++
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              power0 {
++                      label = "bcm53xx:red:power";
++                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              power1 {
++                      label = "bcm53xx:white:power";
++                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              router0 {
++                      label = "bcm53xx:blue:router";
++                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              router1 {
++                      label = "bcm53xx:amber:router";
++                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wan {
++                      label = "bcm53xx:blue:wan";
++                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              wireless0 {
++                      label = "bcm53xx:blue:wireless";
++                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wireless1 {
++                      label = "bcm53xx:amber:wireless";
++                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++      };
++
+       gpio-keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+index e23dbbf..db9131e 100644
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -23,6 +23,73 @@
+               reg = <0x00000000 0x08000000>;
+       };
+ 
++      spi {
++              compatible = "spi-gpio";
++              num-chipselects = <1>;
++              gpio-sck = <&chipcommon 7 0>;
++              gpio-mosi = <&chipcommon 4 0>;
++              cs-gpios = <&chipcommon 6 0>;
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              hc595: gpio_spi@0 {
++                      compatible = "fairchild,74hc595";
++                      reg = <0>;
++                      registers-number = <1>;
++                      spi-max-frequency = <100000>;
++
++                      gpio-controller;
++                      #gpio-cells = <2>;
++
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              power0 {
++                      label = "bcm53xx:green:power";
++                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              power1 {
++                      label = "bcm53xx:red:power";
++                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              router0 {
++                      label = "bcm53xx:green:router";
++                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              router1 {
++                      label = "bcm53xx:amber:router";
++                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wan {
++                      label = "bcm53xx:green:wan";
++                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-on";
++              };
++
++              wireless0 {
++                      label = "bcm53xx:green:wireless";
++                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++
++              wireless1 {
++                      label = "bcm53xx:amber:wireless";
++                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "default-off";
++              };
++      };
++
+       gpio-keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+-- 
+1.8.4.5
+

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 b460d7f9786fe4de1a90413c2dd2b24cc0a4c674..13bec164f0e65b6cdbbdfeb36d8047d37e9ff7bf 100644 (file)
--- 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
@@ -26,7 +26,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +                     0x88000000 0x18000000>;
        };
  
-       gpio-keys {
+       spi {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 @@ -20,7 +20,8 @@
@@ -74,4 +74,4 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +                     0x88000000 0x08000000>;
        };
  
-       gpio-keys {
+       spi {

diff --git a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch
index d92782bd449457d6e218d254236c97f29411c04c..4fb9cbbd9ba5113d100a4740ab3d5b7ced4f9ad2 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch
+++ b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-900DHP.patch
@@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -59,7 +59,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -60,7 +60,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-netgear-r6250.dtb \
        bcm4708-netgear-r6300-v2.dtb \
        bcm47081-asus-rt-n18u.dtb \

diff --git a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch b/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
deleted file mode 100644 (file)
index 7d91c77..0000000
--- a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Add-LEDs-for-Buffalo-devices.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From af26d75225f8b1295d4dec74b9a6a703d582fa40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 11 Dec 2014 12:13:49 +0100
-Subject: [PATCH] ARM: BCM5301X: Add LEDs for Buffalo 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  | 67 ++++++++++++++++++++++
- arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 67 ++++++++++++++++++++++
- 2 files changed, 134 insertions(+)
-
---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -34,6 +34,73 @@
-               };
-       };
- 
-+      spi {
-+              compatible = "spi-gpio";
-+              num-chipselects = <1>;
-+              gpio-sck = <&chipcommon 7 0>;
-+              gpio-mosi = <&chipcommon 4 0>;
-+              cs-gpios = <&chipcommon 6 0>;
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              hc595: gpio_spi@0 {
-+                      compatible = "fairchild,74hc595";
-+                      reg = <0>;
-+                      registers-number = <1>;
-+                      spi-max-frequency = <100000>;
-+
-+                      gpio-controller;
-+                      #gpio-cells = <2>;
-+
-+              };
-+      };
-+
-+      leds {
-+              compatible = "gpio-leds";
-+
-+              power0 {
-+                      label = "bcm53xx:red:power";
-+                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              power1 {
-+                      label = "bcm53xx:white:power";
-+                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              router0 {
-+                      label = "bcm53xx:blue:router";
-+                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              router1 {
-+                      label = "bcm53xx:amber:router";
-+                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wan {
-+                      label = "bcm53xx:blue:wan";
-+                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              wireless0 {
-+                      label = "bcm53xx:blue:wireless";
-+                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wireless1 {
-+                      label = "bcm53xx:amber:wireless";
-+                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+      };
-+
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -34,6 +34,73 @@
-               };
-       };
- 
-+      spi {
-+              compatible = "spi-gpio";
-+              num-chipselects = <1>;
-+              gpio-sck = <&chipcommon 7 0>;
-+              gpio-mosi = <&chipcommon 4 0>;
-+              cs-gpios = <&chipcommon 6 0>;
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              hc595: gpio_spi@0 {
-+                      compatible = "fairchild,74hc595";
-+                      reg = <0>;
-+                      registers-number = <1>;
-+                      spi-max-frequency = <100000>;
-+
-+                      gpio-controller;
-+                      #gpio-cells = <2>;
-+
-+              };
-+      };
-+
-+      leds {
-+              compatible = "gpio-leds";
-+
-+              power0 {
-+                      label = "bcm53xx:green:power";
-+                      gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              power1 {
-+                      label = "bcm53xx:red:power";
-+                      gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              router0 {
-+                      label = "bcm53xx:green:router";
-+                      gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              router1 {
-+                      label = "bcm53xx:amber:router";
-+                      gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wan {
-+                      label = "bcm53xx:green:wan";
-+                      gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-on";
-+              };
-+
-+              wireless0 {
-+                      label = "bcm53xx:green:wireless";
-+                      gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+
-+              wireless1 {
-+                      label = "bcm53xx:amber:wireless";
-+                      gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
-+                      linux,default-trigger = "default-off";
-+              };
-+      };
-+
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;

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 08bf180aed2091aed8ff6291b4c3cdf11ad8e408..2056fd9112ef9948aea1ad456d43df04af945bb6 100644 (file)
--- 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
@@ -13,11 +13,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  2 files changed, 46 insertions(+), 1 deletion(-)
  create mode 100644 arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 0de664e..2db6459 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -62,7 +62,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -61,7 +61,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-netgear-r6300-v2.dtb \
        bcm47081-asus-rt-n18u.dtb \
        bcm47081-buffalo-wzr-600dhp2.dtb \
@@ -25,11 +23,8 @@ index 0de664e..2db6459 100644
 +      bcm47081-buffalo-wzr-900dhp.dtb \
 +      bcm4709-asus-rt-ac87u.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
- dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
-       bcm911360k.dtb \
-diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-new file mode 100644
-index 0000000..c9e06e4
+ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
+       bcm21664-garnet.dtb
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
 @@ -0,0 +1,44 @@
@@ -77,6 +72,3 @@ index 0000000..c9e06e4
 +              };
 +      };
 +};
--- 
-1.8.4.5
-

diff --git a/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch b/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
index 8139ee676187ad415b2b6d01889f4adcea19ec60..cc0e75fd43450613d78e21951dbb3b04aafa3568 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
+++ b/target/linux/bcm53xx/patches-3.18/350-ARM-BCM5301X-Switch-DT-files-to-gpio-keys-polled.patch
@@ -19,7 +19,7 @@ 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
-@@ -92,7 +92,7 @@
+@@ -92,9 +92,10 @@
        };
  
        gpio-keys {
@@ -27,10 +27,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -69,7 +69,7 @@
+@@ -69,9 +69,10 @@
        };
  
        gpio-keys {
@@ -38,10 +41,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -59,7 +59,7 @@
+@@ -59,9 +59,10 @@
        };
  
        gpio-keys {
@@ -49,10 +55,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               wps {
+                       label = "WPS";
 --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
 +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -59,7 +59,7 @@
+@@ -59,9 +59,10 @@
        };
  
        gpio-keys {
@@ -60,10 +69,13 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";
 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -92,7 +92,7 @@
+@@ -92,9 +92,10 @@
        };
  
        gpio-keys {
@@ -71,4 +83,21 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
-               poll-interval = <200>;
++              poll-interval = <200>;
+ 
+               aoss {
+                       label = "AOSS";
+--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -47,9 +47,10 @@
+       };
+ 
+       gpio-keys {
+-              compatible = "gpio-keys";
++              compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
++              poll-interval = <200>;
+ 
+               restart {
+                       label = "Reset";

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 225a4ec9f86628e00ef28542c61b1c5ea0bbd180..a5ed5d27e71d366fa219c6fdddaa7528074cab9f 100644 (file)
--- 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
@@ -16,8 +16,8 @@ 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
-@@ -91,6 +91,16 @@
-               };
+@@ -24,6 +24,16 @@
+                      0x88000000 0x18000000>;
        };
  
 +      chipcommonA {
@@ -30,9 +30,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              };
 +      };
 +
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
+       spi {
+               compatible = "spi-gpio";
+               num-chipselects = <1>;
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 @@ -24,6 +24,16 @@
@@ -73,8 +73,27 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -91,6 +91,16 @@
-               };
+@@ -24,6 +24,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 @@
+               reg = <0x00000000 0x08000000>;
        };
  
 +      chipcommonA {
@@ -87,6 +106,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 +              };
 +      };
 +
-       gpio-keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
+       axi@18000000 {
+               nand@28000 {
+                       reg = <0x00028000 0x1000>;