From e011a5c3752661e9e2da137f701c6610e90bd292 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 7 Jun 2015 14:41:05 +0000 Subject: [PATCH] bcm53xx: backport the latest 4.2 ARM BCM5302X patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 45922 --- ...re-another-BCM4709-specific-fault-c.patch} | 13 +- ...301X-add-NAND-flash-chip-description.patch | 242 ++++++++++++++++++ ...add-IRQ-numbers-for-PCIe-controller.patch} | 47 ++-- ...M-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch} | 13 +- .../301-ARM-BCM5301X-Add-SPROM.patch | 31 +++ ...Enable-earlyprintk-on-tested-devices.patch | 22 +- ...cify-RAM-on-devices-by-including-HIG.patch | 22 +- ...-Buffalo-WXR-1900DHP-clock-and-USB-p.patch | 2 +- ...power-button-for-Buffalo-WZR-1750DHP.patch | 2 +- ...nable-ChipCommon-UART-serial-console.patch | 30 +-- ...-back-Luxul-XWC-1000-NAND-flash-layo.patch | 42 +++ 11 files changed, 391 insertions(+), 75 deletions(-) rename target/linux/bcm53xx/patches-3.18/{132-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch => 063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch} (78%) create mode 100644 target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch rename target/linux/bcm53xx/patches-3.18/{130-ARM-BCM5301X-register-bcma-bus.patch => 065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch} (64%) rename target/linux/bcm53xx/patches-3.18/{133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch => 066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch} (84%) create mode 100644 target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch create mode 100644 target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch diff --git a/target/linux/bcm53xx/patches-3.18/132-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch b/target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch similarity index 78% rename from target/linux/bcm53xx/patches-3.18/132-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch rename to target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch index 786e4b9b55..e41d8b853c 100644 --- a/target/linux/bcm53xx/patches-3.18/132-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch +++ b/target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch @@ -1,8 +1,7 @@ -From cd43921285658372c0db8019684979edb74eaffd Mon Sep 17 00:00:00 2001 +From 7eb68a2a0519a77b93184c695d4d293c92dc2286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 11 Feb 2015 16:37:05 +0100 -Subject: [PATCH soc] ARM: BCM5301X: Ignore another (BCM4709 specific) fault - code +Date: Wed, 11 Feb 2015 16:40:58 +0100 +Subject: [PATCH] ARM: BCM5301X: Ignore another (BCM4709 specific) fault code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,10 +11,13 @@ already have an ignoring handler for BCM4707/BCM4708, but BCM4709 generates different code. Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli --- arch/arm/mach-bcm/bcm_5301x.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) +diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c +index e9bcbdb..7aef927 100644 --- a/arch/arm/mach-bcm/bcm_5301x.c +++ b/arch/arm/mach-bcm/bcm_5301x.c @@ -18,15 +18,16 @@ static bool first_fault = true; @@ -39,3 +41,6 @@ Signed-off-by: Rafał Miłecki /* Returning non-zero causes fault display and panic */ return 0; +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch b/target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch new file mode 100644 index 0000000000..04527412a0 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch @@ -0,0 +1,242 @@ +From 9faa5960eef3204cae6637b530f5e23e53b5a9ef Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Fri, 29 May 2015 23:39:47 +0200 +Subject: [PATCH] ARM: BCM5301X: add NAND flash chip description + +This adds the NAND flash chip description for a standard chip found +connected to this SoC. This makes use of generic Broadcom NAND driver +with the iProc interface. + +Signed-off-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 1 + + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 1 + + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 1 + + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 9 +++----- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 1 + + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 1 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 1 + + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 1 + + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 1 + + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 1 + + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 1 + + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 1 + + arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 24 ++++++++++++++++++++++ + arch/arm/boot/dts/bcm5301x.dtsi | 12 +++++++++++ + 14 files changed, 50 insertions(+), 6 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi + +diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +index 71cff8d..112a5a8 100644 +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "asus,rt-ac56u", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +index 8b62836..3600f56 100644 +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "asus,rt-ac68u", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +index 78e95c0..24f0ab5 100644 +--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts ++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +index 946c728..f039393 100644 +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "luxul,xwc-1000", "brcm,bcm4708"; +@@ -23,12 +24,8 @@ + reg = <0x00000000 0x08000000>; + }; + +- axi@18000000 { +- nand@28000 { +- reg = <0x00028000 0x1000>; +- #address-cells = <1>; +- #size-cells = <1>; +- ++ nand: nand@18028000 { ++ nandcs@0 { + partition@0 { + label = "ubi"; + reg = <0x00000000 0x08000000>; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +index 2ed9e57..326ce8f 100644 +--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "netgear,r6250v1", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +index 3991042..3a94606 100644 +--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "netgear,r6300v2", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +index 66dfb53..d6a033b 100644 +--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts ++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "smartrg,sr400ac", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +index 0ee85ea..71b98cf 100644 +--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts ++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm47081.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +index db9131e..bb0cb0b 100644 +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm47081.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +index 7d6868a..184fd92 100644 +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm47081.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "buffalo,wzr-900dhp", "brcm,bcm47081", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +index 548e93b..2a92e8d 100644 +--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts ++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "buffalo,wxr-1900dhp", "brcm,bcm4709", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +index ea26dd3..446c586 100644 +--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts ++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +@@ -10,6 +10,7 @@ + /dts-v1/; + + #include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" + + / { + compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708"; +diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi +new file mode 100644 +index 0000000..d10781e +--- /dev/null ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi +@@ -0,0 +1,24 @@ ++/* ++ * Broadcom BCM470X / BCM5301X Nand chip defaults. ++ * ++ * This should be included if the NAND controller is on chip select 0 ++ * and uses 8 bit ECC. ++ * ++ * Copyright (C) 2015 Hauke Mehrtens ++ * ++ * Licensed under the GNU/GPL. See COPYING for details. ++ */ ++ ++/ { ++ nand@18028000 { ++ nandcs@0 { ++ compatible = "brcm,nandcs"; ++ reg = <0>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ nand-ecc-strength = <8>; ++ nand-ecc-step-size = <512>; ++ }; ++ }; ++}; +diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi +index 78aec62..a97f631 100644 +--- a/arch/arm/boot/dts/bcm5301x.dtsi ++++ b/arch/arm/boot/dts/bcm5301x.dtsi +@@ -143,4 +143,16 @@ + #gpio-cells = <2>; + }; + }; ++ ++ nand: nand@18028000 { ++ compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; ++ reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>; ++ reg-names = "nand", "iproc-idm", "iproc-ext"; ++ interrupts = ; ++ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ brcm,nand-has-wp; ++ }; + }; +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-register-bcma-bus.patch b/target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch similarity index 64% rename from target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-register-bcma-bus.patch rename to target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch index 4044b44ff2..fe3a0ceb07 100644 --- a/target/linux/bcm53xx/patches-3.18/130-ARM-BCM5301X-register-bcma-bus.patch +++ b/target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch @@ -1,39 +1,23 @@ -From 414f0ad9b3a8e8ee6eaf09c6d79d5f448ac28630 Mon Sep 17 00:00:00 2001 +From 1f80de6863ca0e36cabc622e858168fe5beb1e92 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens -Date: Sat, 25 Jan 2014 17:03:07 +0100 -Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus +Date: Sun, 24 May 2015 21:08:14 +0200 +Subject: [PATCH] ARM: BCM5301X: add IRQ numbers for PCIe controller +The driver for the PCIe controller was just added, this adds the +missing definition of the IRQ numbers to device tree. The driver itself +will be automatically detected by bcma. + +Signed-off-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli --- - arch/arm/boot/dts/bcm4708.dtsi | 58 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 58 insertions(+) + arch/arm/boot/dts/bcm5301x.dtsi | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) +diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi +index a97f631..21fefd4 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi -@@ -95,12 +95,23 @@ - }; - }; - -+ nvram0: nvram@1c000000 { -+ compatible = "brcm,bcm47xx-nvram"; -+ reg = <0x1c000000 0x01000000>; -+ }; -+ -+ sprom0: sprom@0 { -+ compatible = "brcm,bcm47xx-sprom"; -+ nvram = <&nvram0>; -+ }; -+ - axi@18000000 { - compatible = "brcm,bus-axi"; - reg = <0x18000000 0x1000>; - ranges = <0x00000000 0x18000000 0x00100000>; - #address-cells = <1>; - #size-cells = <1>; -+ sprom = <&sprom0>; - - #interrupt-cells = <1>; - interrupt-map-mask = <0x000fffff 0xffff>; -@@ -108,6 +119,30 @@ +@@ -108,6 +108,30 @@ /* ChipCommon */ <0x00000000 0 &gic GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>, @@ -64,3 +48,6 @@ Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus /* USB 2.0 Controller */ <0x00021000 0 &gic GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>, +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.18/133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch b/target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch similarity index 84% rename from target/linux/bcm53xx/patches-3.18/133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch rename to target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch index 5105cec5ae..68bf3c67b1 100644 --- a/target/linux/bcm53xx/patches-3.18/133-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch +++ b/target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch @@ -1,6 +1,6 @@ -From 1f970a144215ec8bbd96a3d79aea8a19ed8d109a Mon Sep 17 00:00:00 2001 +From 26343bdacfcdbf6ee3303d6078a015b908f90193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Sat, 16 May 2015 16:51:51 +0200 +Date: Sat, 16 May 2015 16:55:39 +0200 Subject: [PATCH] ARM: BCM5301X: Add DT for Asus RT-AC87U MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,12 +8,15 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki Signed-off-by: Álvaro Fernández Rojas +Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 65 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) 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 4802376..4e76f68 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -65,6 +65,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ @@ -24,6 +27,9 @@ Signed-off-by: Álvaro Fernández Rojas bcm4709-buffalo-wxr-1900dhp.dtb \ bcm4709-netgear-r8000.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.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..aedf3c4 --- /dev/null +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts @@ -0,0 +1,65 @@ @@ -92,3 +98,6 @@ Signed-off-by: Álvaro Fernández Rojas + }; + }; +}; +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch new file mode 100644 index 0000000000..a52efea29f --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch @@ -0,0 +1,31 @@ +From d404e0b22356078a51719fa911f6e09cb1a72d80 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Sun, 7 Jun 2015 16:18:18 +0200 +Subject: [PATCH] ARM: BCM5301X: Add SPROM +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Rafał Miłecki +--- + arch/arm/boot/dts/bcm5301x.dtsi | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi +index 21fefd4..58515f8 100644 +--- a/arch/arm/boot/dts/bcm5301x.dtsi ++++ b/arch/arm/boot/dts/bcm5301x.dtsi +@@ -95,6 +95,10 @@ + }; + }; + ++ sprom0: sprom@0 { ++ compatible = "brcm,bcm47xx-sprom"; ++ }; ++ + axi@18000000 { + compatible = "brcm,bus-axi"; + reg = <0x18000000 0x1000>; +-- +1.8.4.5 + diff --git a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch index 4a6344ab32..9b562ce1a9 100644 --- a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch +++ b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch @@ -16,7 +16,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Buffalo WZR-1750DHP (BCM4708)"; chosen { @@ -27,7 +27,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Netgear R6250 V1 (BCM4708)"; chosen { @@ -38,7 +38,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Asus RT-N18U (BCM47081)"; chosen { @@ -49,7 +49,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Buffalo WZR-600DHP2 (BCM47081)"; chosen { @@ -60,7 +60,7 @@ Signed-off-by: Rafał Miłecki 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 @@ +@@ -17,7 +17,7 @@ model = "Buffalo WZR-900DHP (BCM47081)"; chosen { @@ -71,7 +71,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Netgear R8000 (BCM4709)"; chosen { @@ -82,7 +82,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Asus RT-AC56U (BCM4708)"; chosen { @@ -93,7 +93,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Asus RT-AC68U (BCM4708)"; chosen { @@ -104,7 +104,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Luxul XWC-1000 (BCM4708)"; chosen { @@ -115,7 +115,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "Buffalo WXR-1900DHP"; chosen { @@ -126,7 +126,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ model = "SmartRG SR400ac"; chosen { 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 5026371aa9..6637a62adc 100644 --- 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 @@ -17,7 +17,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -29,7 +29,7 @@ Signed-off-by: Rafał Miłecki spi { --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -41,7 +41,7 @@ Signed-off-by: Rafał Miłecki chipcommonA { --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -53,7 +53,7 @@ Signed-off-by: Rafał Miłecki leds { --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -65,7 +65,7 @@ Signed-off-by: Rafał Miłecki leds { --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -77,7 +77,7 @@ Signed-off-by: Rafał Miłecki 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 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -89,7 +89,7 @@ Signed-off-by: Rafał Miłecki gpio-keys { --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -101,7 +101,7 @@ Signed-off-by: Rafał Miłecki leds { --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -113,7 +113,7 @@ Signed-off-by: Rafał Miłecki leds { --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -125,7 +125,7 @@ Signed-off-by: Rafał Miłecki leds { --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { @@ -137,7 +137,7 @@ Signed-off-by: Rafał Miłecki leds { --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -@@ -20,7 +20,8 @@ +@@ -21,7 +21,8 @@ }; memory { diff --git a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch index af4c6b2bc6..f99460aa46 100644 --- a/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch +++ b/target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch @@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -24,6 +24,23 @@ +@@ -25,6 +25,23 @@ 0x88000000 0x18000000>; }; diff --git a/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch index eeca753073..849537e032 100644 --- a/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch +++ b/target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch @@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau --- --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -102,6 +102,12 @@ +@@ -103,6 +103,12 @@ #address-cells = <1>; #size-cells = <0>; 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 973db0f01c..07e1e73967 100644 --- 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,7 +16,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -24,6 +24,16 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x18000000>; }; @@ -35,7 +35,7 @@ Signed-off-by: Rafał Miłecki 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 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x08000000>; }; @@ -54,7 +54,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -24,6 +24,16 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x08000000>; }; @@ -73,7 +73,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -24,6 +24,16 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x08000000>; }; @@ -93,9 +93,10 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts @@ -23,6 +23,16 @@ + memory { reg = <0x00000000 0x08000000>; }; - ++ + chipcommonA { + uart0: serial@0300 { + status = "okay"; @@ -105,13 +106,12 @@ Signed-off-by: Rafał Miłecki + status = "okay"; + }; + }; -+ - axi@18000000 { - nand@28000 { - reg = <0x00028000 0x1000>; + + nand: nand@18028000 { + nandcs@0 { --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -@@ -24,6 +24,16 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x08000000>; }; @@ -151,7 +151,7 @@ Signed-off-by: Rafał Miłecki #address-cells = <1>; --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts -@@ -24,6 +24,18 @@ +@@ -25,6 +25,18 @@ 0x88000000 0x08000000>; }; @@ -172,7 +172,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -@@ -24,6 +24,16 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x08000000>; }; @@ -191,7 +191,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -@@ -24,6 +24,16 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x08000000>; }; @@ -210,7 +210,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -24,6 +24,18 @@ +@@ -25,6 +25,18 @@ 0x88000000 0x18000000>; }; @@ -231,7 +231,7 @@ Signed-off-by: Rafał Miłecki clock-frequency = <500000000>; --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -@@ -24,6 +24,16 @@ +@@ -25,6 +25,16 @@ 0x88000000 0x08000000>; }; diff --git a/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch b/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch new file mode 100644 index 0000000000..ae9936291b --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch @@ -0,0 +1,42 @@ +From b97e582cd05f6ba80bdb63d9f677a3395edc7ff1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Sun, 7 Jun 2015 15:37:43 +0200 +Subject: [PATCH] ARM: BCM5301X: Add back Luxul XWC-1000 NAND flash layout +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In OpenWrt we still use old NAND driver instead of "brcm,nandcs", so +we need to add this DT entry back. + +Signed-off-by: Rafał Miłecki +--- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +index b84a503..413978a 100644 +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -34,6 +34,18 @@ + }; + }; + ++ axi@18000000 { ++ nand@28000 { ++ reg = <0x00028000 0x1000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ partition@0 { ++ label = "ubi"; ++ reg = <0x00000000 0x08000000>; ++ }; ++ }; ++ }; ++ + nand: nand@18028000 { + nandcs@0 { + partition@0 { +-- +1.8.4.5 + -- 2.25.1