bcm53xx: backport official Buffalo WZR-900DHP patch

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

SVN-Revision: 44070
lede-17.01
Rafał Miłecki 2015-01-21 07:23:31 +00:00
parent 3b701e8023
commit bba98a3c53
17 changed files with 174 additions and 45 deletions

View File

@ -1,7 +1,7 @@
From 0da909663566b34e0294ab0ff1ea08908164811e Mon Sep 17 00:00:00 2001 From e27a09ae9369e10bc589ef4d720ecf4abcbcec50 Mon Sep 17 00:00:00 2001
From: Dan Haab <dhaab@luxul.com> From: Dan Haab <dhaab@luxul.com>
Date: Wed, 7 Jan 2015 14:34:50 -0700 Date: Mon, 19 Jan 2015 12:45:37 -0700
Subject: [PATCH 52/54] ARM: BCM5301X: Add DT for Luxul XWC-1000 Subject: [PATCH] ARM: BCM5301X: Add DT for Luxul XWC-1000
Luxul XWC-1000 is a controller device based on BCM4708 SoC. The only 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. unusual thing in its DTS file is "ubi" partition on NAND flash.

View File

@ -1,7 +1,7 @@
From b2c76541507c28fd93548c5639366d2149382b73 Mon Sep 17 00:00:00 2001 From 78b745a4b05c920beaa66dfb140af134b5fc2425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 14 Jan 2015 08:20:48 +0100 Date: Wed, 14 Jan 2015 08:20:48 +0100
Subject: [PATCH 53/54] ARM: BCM5301X: Drop unused poll-interval from gpio-keys Subject: [PATCH] ARM: BCM5301X: Drop unused poll-interval from gpio-keys
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit

View File

@ -1,7 +1,7 @@
From 766f8b55ba3f38dffc25a7dc0dd58502fd710f0a Mon Sep 17 00:00:00 2001 From 8115a4e8d687427fbc1aa3774f50551563bf87f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 14 Jan 2015 08:20:49 +0100 Date: Wed, 14 Jan 2015 08:20:49 +0100
Subject: [PATCH 54/54] ARM: BCM5301X: Add LEDs for Buffalo devices Subject: [PATCH] ARM: BCM5301X: Add LEDs for Buffalo devices
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit

View File

@ -1,18 +1,21 @@
From 840327b33202a791d4aae36c5deca56d283c209f Mon Sep 17 00:00:00 2001 From 5b1864b899d2b591402704dd0f6528c8661f1817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Sun, 7 Dec 2014 11:44:53 +0100 Date: Tue, 20 Jan 2015 22:42:16 +0100
Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-900DHP Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-900DHP
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- ---
arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 35 +++++++++++++++++++++++ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 37 +++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-) 2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ff4a5ae..0de664e 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -56,7 +56,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ @@ -56,7 +56,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
@ -27,12 +30,12 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
berlin2cd-google-chromecast.dtb berlin2cd-google-chromecast.dtb
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -0,0 +1,36 @@ @@ -0,0 +1,37 @@
+/* +/*
+ * Broadcom BCM470X / BCM5301X ARM platform code. + * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Buffalo WZR-900DHP + * DTS for Buffalo WZR-900DHP
+ * + *
+ * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com> + * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
+ * + *
+ * Licensed under the GNU/GPL. See COPYING for details. + * Licensed under the GNU/GPL. See COPYING for details.
+ */ + */
@ -46,21 +49,25 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+ model = "Buffalo WZR-900DHP (BCM47081)"; + model = "Buffalo WZR-900DHP (BCM47081)";
+ +
+ chosen { + chosen {
+ bootargs = "console=ttyS0,115200 earlyprintk"; + bootargs = "console=ttyS0,115200";
+ }; + };
+ +
+ memory { + memory {
+ reg = <0x00000000 0x08000000 + reg = <0x00000000 0x08000000>;
+ 0x88000000 0x08000000>;
+ }; + };
+ +
+ chipcommonA { + gpio-keys {
+ uart0: serial@0300 { + compatible = "gpio-keys";
+ status = "okay"; + #address-cells = <1>;
+ }; + #size-cells = <0>;
+ +
+ uart1: serial@0400 { + restart {
+ status = "okay"; + label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ }; + };
+ }; + };
+}; +};
--
1.8.4.5

View File

@ -15,7 +15,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/pci/probe.c --- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c +++ b/drivers/pci/probe.c
@@ -1912,7 +1912,10 @@ struct pci_bus *pci_scan_root_bus(struct @@ -1915,7 +1915,10 @@ struct pci_bus *pci_scan_root_bus(struct
if (!found) if (!found)
pci_bus_update_busn_res_end(b, max); pci_bus_update_busn_res_end(b, max);

View File

@ -65,6 +65,17 @@ index bbb414f..20903a5 100644
+ bootargs = "console=ttyS0,115200 earlyprintk"; + 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
@@ -16,7 +16,7 @@
model = "Buffalo WZR-900DHP (BCM47081)";
chosen {
- bootargs = "console=ttyS0,115200";
+ bootargs = "console=ttyS0,115200 earlyprintk";
};
memory { memory {
-- --
1.8.4.5 1.8.4.5

View File

@ -75,3 +75,15 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
}; };
spi { spi {
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -20,7 +20,8 @@
};
memory {
- reg = <0x00000000 0x08000000>;
+ reg = <0x00000000 0x08000000
+ 0x88000000 0x08000000>;
};
gpio-keys {

View File

@ -101,3 +101,17 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
restart { restart {
label = "Reset"; label = "Reset";
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -25,9 +25,10 @@
};
gpio-keys {
- compatible = "gpio-keys";
+ compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
+ poll-interval = <200>;
restart {
label = "Reset";

View File

@ -109,3 +109,22 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
axi@18000000 { axi@18000000 {
nand@28000 { nand@28000 {
reg = <0x00028000 0x1000>; reg = <0x00028000 0x1000>;
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -24,6 +24,16 @@
0x88000000 0x08000000>;
};
+ chipcommonA {
+ uart0: serial@0300 {
+ status = "okay";
+ };
+
+ uart1: serial@0400 {
+ status = "okay";
+ };
+ };
+
gpio-keys {
compatible = "gpio-keys-polled";
#address-cells = <1>;

View File

@ -1,7 +1,7 @@
From 0da909663566b34e0294ab0ff1ea08908164811e Mon Sep 17 00:00:00 2001 From e27a09ae9369e10bc589ef4d720ecf4abcbcec50 Mon Sep 17 00:00:00 2001
From: Dan Haab <dhaab@luxul.com> From: Dan Haab <dhaab@luxul.com>
Date: Wed, 7 Jan 2015 14:34:50 -0700 Date: Mon, 19 Jan 2015 12:45:37 -0700
Subject: [PATCH 52/54] ARM: BCM5301X: Add DT for Luxul XWC-1000 Subject: [PATCH] ARM: BCM5301X: Add DT for Luxul XWC-1000
Luxul XWC-1000 is a controller device based on BCM4708 SoC. The only 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. unusual thing in its DTS file is "ubi" partition on NAND flash.

View File

@ -1,7 +1,7 @@
From b2c76541507c28fd93548c5639366d2149382b73 Mon Sep 17 00:00:00 2001 From 78b745a4b05c920beaa66dfb140af134b5fc2425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 14 Jan 2015 08:20:48 +0100 Date: Wed, 14 Jan 2015 08:20:48 +0100
Subject: [PATCH 53/54] ARM: BCM5301X: Drop unused poll-interval from gpio-keys Subject: [PATCH] ARM: BCM5301X: Drop unused poll-interval from gpio-keys
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit

View File

@ -1,7 +1,7 @@
From 766f8b55ba3f38dffc25a7dc0dd58502fd710f0a Mon Sep 17 00:00:00 2001 From 8115a4e8d687427fbc1aa3774f50551563bf87f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 14 Jan 2015 08:20:49 +0100 Date: Wed, 14 Jan 2015 08:20:49 +0100
Subject: [PATCH 54/54] ARM: BCM5301X: Add LEDs for Buffalo devices Subject: [PATCH] ARM: BCM5301X: Add LEDs for Buffalo devices
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit

View File

@ -1,18 +1,21 @@
From 840327b33202a791d4aae36c5deca56d283c209f Mon Sep 17 00:00:00 2001 From 5b1864b899d2b591402704dd0f6528c8661f1817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Sun, 7 Dec 2014 11:44:53 +0100 Date: Tue, 20 Jan 2015 22:42:16 +0100
Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-900DHP Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WZR-900DHP
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- ---
arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 35 +++++++++++++++++++++++ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 37 +++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-) 2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ff4a5ae..0de664e 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -60,7 +60,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ @@ -60,7 +60,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
@ -25,14 +28,17 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
bcm21664-garnet.dtb bcm21664-garnet.dtb
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
new file mode 100644
index 0000000..7d6868a
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -0,0 +1,36 @@ @@ -0,0 +1,37 @@
+/* +/*
+ * Broadcom BCM470X / BCM5301X ARM platform code. + * Broadcom BCM470X / BCM5301X ARM platform code.
+ * DTS for Buffalo WZR-900DHP + * DTS for Buffalo WZR-900DHP
+ * + *
+ * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com> + * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
+ * + *
+ * Licensed under the GNU/GPL. See COPYING for details. + * Licensed under the GNU/GPL. See COPYING for details.
+ */ + */
@ -46,21 +52,25 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+ model = "Buffalo WZR-900DHP (BCM47081)"; + model = "Buffalo WZR-900DHP (BCM47081)";
+ +
+ chosen { + chosen {
+ bootargs = "console=ttyS0,115200 earlyprintk"; + bootargs = "console=ttyS0,115200";
+ }; + };
+ +
+ memory { + memory {
+ reg = <0x00000000 0x08000000 + reg = <0x00000000 0x08000000>;
+ 0x88000000 0x08000000>;
+ }; + };
+ +
+ chipcommonA { + gpio-keys {
+ uart0: serial@0300 { + compatible = "gpio-keys";
+ status = "okay"; + #address-cells = <1>;
+ }; + #size-cells = <0>;
+ +
+ uart1: serial@0400 { + restart {
+ status = "okay"; + label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ }; + };
+ }; + };
+}; +};
--
1.8.4.5

View File

@ -65,6 +65,17 @@ index bbb414f..20903a5 100644
+ bootargs = "console=ttyS0,115200 earlyprintk"; + 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
@@ -16,7 +16,7 @@
model = "Buffalo WZR-900DHP (BCM47081)";
chosen {
- bootargs = "console=ttyS0,115200";
+ bootargs = "console=ttyS0,115200 earlyprintk";
};
memory { memory {
-- --
1.8.4.5 1.8.4.5

View File

@ -75,3 +75,15 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
}; };
spi { spi {
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -20,7 +20,8 @@
};
memory {
- reg = <0x00000000 0x08000000>;
+ reg = <0x00000000 0x08000000
+ 0x88000000 0x08000000>;
};
gpio-keys {

View File

@ -101,3 +101,17 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
restart { restart {
label = "Reset"; label = "Reset";
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -25,9 +25,10 @@
};
gpio-keys {
- compatible = "gpio-keys";
+ compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
+ poll-interval = <200>;
restart {
label = "Reset";

View File

@ -109,3 +109,22 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
axi@18000000 { axi@18000000 {
nand@28000 { nand@28000 {
reg = <0x00028000 0x1000>; reg = <0x00028000 0x1000>;
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -24,6 +24,16 @@
0x88000000 0x08000000>;
};
+ chipcommonA {
+ uart0: serial@0300 {
+ status = "okay";
+ };
+
+ uart1: serial@0400 {
+ status = "okay";
+ };
+ };
+
gpio-keys {
compatible = "gpio-keys-polled";
#address-cells = <1>;