bcm53xx: backport DTS changes queued for the 4.21
authorRafał Miłecki <rafal@milecki.pl>
Thu, 27 Dec 2018 06:25:40 +0000 (07:25 +0100)
committerRafał Miłecki <rafal@milecki.pl>
Thu, 27 Dec 2018 06:33:24 +0000 (07:33 +0100)
It just replaces some downstream patches & adds relicensing work.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
12 files changed:
target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-4.14/035-v4.21-0001-ARM-dts-BCM5301X-Relicense-BCM47081-BCM4709-files-to.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-4.14/035-v4.21-0002-ARM-dts-BCM5301X-Relicense-BCM47094-file-to-the-GPL-.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-4.14/035-v4.21-0003-ARM-dts-BCM53573-Relicense-Tenda-AC9-file-to-the-GPL.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-4.14/035-v4.21-0004-ARM-dts-BCM53573-Relicense-SoC-file-to-the-GPL-2.0-M.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-4.14/035-v4.21-0005-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-4.14/035-v4.21-0006-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch [new file with mode: 0644]
target/linux/bcm53xx/patches-4.14/130-ARM-dts-BCM5301X-Specify-flash-partitions.patch [deleted file]
target/linux/bcm53xx/patches-4.14/131-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch [deleted file]
target/linux/bcm53xx/patches-4.14/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch
target/linux/bcm53xx/patches-4.14/315-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch [deleted file]
target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch

diff --git a/target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch b/target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch
new file mode 100644 (file)
index 0000000..e6e2522
--- /dev/null
@@ -0,0 +1,167 @@
+From b0465fdfdd7e7c1afe2fae1cb36b94e1ce89732e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Sat, 28 Jul 2018 14:13:57 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Specify flash partitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Most devices use Broadcom standard partitions which allows them to be
+described with the "brcm,bcm947xx-cfe-partitions". Exceptions are:
+1) TP-LINK devices which use "os-image" partition with TRX containing
+   kernel only + separated rootfs partition.
+2) Asus RT-AC87U with custom "asus" partition.
+
+This commit also removes undocumented and unsupported linux,part-probe
+binding which got accidentally upstreamed while describing SPI
+controller.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 28 +++++++++++++++++++
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts        | 31 ++++++++++++++++++++++
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 28 +++++++++++++++++++
+ arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi           |  4 +++
+ arch/arm/boot/dts/bcm5301x.dtsi                    |  5 +++-
+ 5 files changed, 95 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+@@ -94,6 +94,34 @@
+ &spi_nor {
+       status = "okay";
++
++      partitions {
++              compatible = "fixed-partitions";
++              #address-cells = <1>;
++              #size-cells = <1>;
++
++              boot@0 {
++                      label = "boot";
++                      reg = <0x000000 0x040000>;
++                      read-only;
++              };
++
++              os-image@100000 {
++                      label = "os-image";
++                      reg = <0x040000 0x200000>;
++                      compatible = "brcm,trx";
++              };
++
++              rootfs@240000 {
++                      label = "rootfs";
++                      reg = <0x240000 0xc00000>;
++              };
++
++              nvram@ff0000 {
++                      label = "nvram";
++                      reg = <0xff0000 0x010000>;
++              };
++      };
+ };
+ &usb2 {
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -66,3 +66,34 @@
+ &usb3_phy {
+       status = "okay";
+ };
++
++&nandcs {
++      partitions {
++              compatible = "fixed-partitions";
++              #address-cells = <1>;
++              #size-cells = <1>;
++
++              boot@0 {
++                      label = "boot";
++                      reg = <0x00000000 0x00080000>;
++                      read-only;
++              };
++
++              nvram@80000 {
++                      label = "nvram";
++                      reg = <0x00080000 0x00180000>;
++              };
++
++              firmware@200000 {
++                      label = "firmware";
++                      reg = <0x00200000 0x07cc0000>;
++                      compatible = "brcm,trx";
++              };
++
++              asus@7ec0000 {
++                      label = "asus";
++                      reg = <0x07ec0000 0x00140000>;
++                      read-only;
++              };
++      };
++};
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -103,6 +103,34 @@
+ &spi_nor {
+       status = "okay";
++
++      partitions {
++              compatible = "fixed-partitions";
++              #address-cells = <1>;
++              #size-cells = <1>;
++
++              boot@0 {
++                      label = "boot";
++                      reg = <0x000000 0x040000>;
++                      read-only;
++              };
++
++              os-image@100000 {
++                      label = "os-image";
++                      reg = <0x040000 0x200000>;
++                      compatible = "brcm,trx";
++              };
++
++              rootfs@240000 {
++                      label = "rootfs";
++                      reg = <0x240000 0xc00000>;
++              };
++
++              nvram@ff0000 {
++                      label = "nvram";
++                      reg = <0xff0000 0x010000>;
++              };
++      };
+ };
+ &usb3_phy {
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -12,6 +12,10 @@
+                       reg = <0>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
++
++                      partitions {
++                              compatible = "brcm,bcm947xx-cfe-partitions";
++                      };
+               };
+       };
+ };
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -475,8 +475,11 @@
+                       compatible = "jedec,spi-nor";
+                       reg = <0>;
+                       spi-max-frequency = <20000000>;
+-                      linux,part-probe = "ofpart", "bcm47xxpart";
+                       status = "disabled";
++
++                      partitions {
++                              compatible = "brcm,bcm947xx-cfe-partitions";
++                      };
+               };
+       };
diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.21-0001-ARM-dts-BCM5301X-Relicense-BCM47081-BCM4709-files-to.patch b/target/linux/bcm53xx/patches-4.14/035-v4.21-0001-ARM-dts-BCM5301X-Relicense-BCM47081-BCM4709-files-to.patch
new file mode 100644 (file)
index 0000000..2dc6b2c
--- /dev/null
@@ -0,0 +1,58 @@
+From 26ff86f7794b9466481ccf29ac79925d327f106d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 20 Sep 2018 13:18:47 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Relicense BCM47081/BCM4709 files to the
+ GPL 2.0+ / MIT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This matches licensing used by other BCM5301X files and is preferred as:
+1) GPL 2.0+ makes it clearly compatible with Linux kernel
+2) MIT is also permissive but preferred over ISC
+
+Both files were fully developed by me. Commits touching them were signed
+by Florian and Hauke due to submitting process only.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47081.dtsi | 13 +------------
+ arch/arm/boot/dts/bcm4709.dtsi  |  3 +--
+ 2 files changed, 2 insertions(+), 14 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47081.dtsi
++++ b/arch/arm/boot/dts/bcm47081.dtsi
+@@ -1,20 +1,9 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ /*
+  * Broadcom BCM470X / BCM5301X ARM platform code.
+  * DTS for BCM47081 SoC.
+  *
+  * Copyright © 2014 Rafał Miłecki <zajec5@gmail.com>
+- *
+- * Permission to use, copy, modify, and/or distribute this software for any
+- * purpose with or without fee is hereby granted, provided that the above
+- * copyright notice and this permission notice appear in all copies.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+- * PERFORMANCE OF THIS SOFTWARE.
+  */
+ #include "bcm5301x.dtsi"
+--- a/arch/arm/boot/dts/bcm4709.dtsi
++++ b/arch/arm/boot/dts/bcm4709.dtsi
+@@ -1,7 +1,6 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ /*
+  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
+- *
+- * Licensed under the ISC license.
+  */
+ #include "bcm4708.dtsi"
diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.21-0002-ARM-dts-BCM5301X-Relicense-BCM47094-file-to-the-GPL-.patch b/target/linux/bcm53xx/patches-4.14/035-v4.21-0002-ARM-dts-BCM5301X-Relicense-BCM47094-file-to-the-GPL-.patch
new file mode 100644 (file)
index 0000000..86c6b0a
--- /dev/null
@@ -0,0 +1,33 @@
+From d10967344375026ca8762b6080dec2585d895906 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 20 Sep 2018 13:20:19 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Relicense BCM47094 file to the GPL 2.0+ /
+ MIT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This matches licensing used by other BCM5301X files and is preferred as:
+1) GPL 2.0+ makes it clearly compatible with Linux kernel
+2) MIT is also permissive but preferred over ISC
+
+This file has been developed by me & once modified by Vivek.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Vivek Unune <npcomplete13@gmail.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47094.dtsi | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47094.dtsi
++++ b/arch/arm/boot/dts/bcm47094.dtsi
+@@ -1,7 +1,6 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ /*
+  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
+- *
+- * Licensed under the ISC license.
+  */
+ #include "bcm4708.dtsi"
diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.21-0003-ARM-dts-BCM53573-Relicense-Tenda-AC9-file-to-the-GPL.patch b/target/linux/bcm53xx/patches-4.14/035-v4.21-0003-ARM-dts-BCM53573-Relicense-Tenda-AC9-file-to-the-GPL.patch
new file mode 100644 (file)
index 0000000..a5358b7
--- /dev/null
@@ -0,0 +1,32 @@
+From 1c9001b4f69a37820862286b3bbcdde152a52dcf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 20 Sep 2018 13:37:47 +0200
+Subject: [PATCH] ARM: dts: BCM53573: Relicense Tenda AC9 file to the GPL 2.0+
+ / MIT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This matches licensing used by most of BCM5301X files and is preferred as:
+1) GPL 2.0+ makes it clearly compatible with Linux kernel
+2) MIT is also permissive but preferred over ISC
+
+This file was fully developed by me.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
++++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
+@@ -1,7 +1,6 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ /*
+  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
+- *
+- * Licensed under the ISC license.
+  */
+ /dts-v1/;
diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.21-0004-ARM-dts-BCM53573-Relicense-SoC-file-to-the-GPL-2.0-M.patch b/target/linux/bcm53xx/patches-4.14/035-v4.21-0004-ARM-dts-BCM53573-Relicense-SoC-file-to-the-GPL-2.0-M.patch
new file mode 100644 (file)
index 0000000..56cd637
--- /dev/null
@@ -0,0 +1,33 @@
+From ca3a6e705cad10662827093d5426abe078861793 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 20 Sep 2018 13:39:28 +0200
+Subject: [PATCH] ARM: dts: BCM53573: Relicense SoC file to the GPL 2.0+ / MIT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This matches licensing used by most of BCM5301X files and is preferred as:
+1) GPL 2.0+ makes it clearly compatible with Linux kernel
+2) MIT is also permissive but preferred over ISC
+
+This file has been developed by me & once modified by Rob dropping a
+single leading zero in an UART address.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Rob Herring <robh@kernel.org>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm53573.dtsi | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm53573.dtsi
++++ b/arch/arm/boot/dts/bcm53573.dtsi
+@@ -1,7 +1,6 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ /*
+  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
+- *
+- * Licensed under the ISC license.
+  */
+ #include <dt-bindings/gpio/gpio.h>
diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.21-0005-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch b/target/linux/bcm53xx/patches-4.14/035-v4.21-0005-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch
new file mode 100644 (file)
index 0000000..d657d7a
--- /dev/null
@@ -0,0 +1,75 @@
+From 03e96644d7a810916fc4997d572577e876908b18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20Kjellerup?= <rk.katana.steel@gmail.com>
+Date: Mon, 1 Oct 2018 15:07:16 -0700
+Subject: [PATCH] ARM: dts: BCM5301X: Add basic DT for Linksys EA6500 V2
+
+It is wireless home router based on BCM4708A0 with BCM4360 + BCM4331
+wireless chipsets. The BCM4331 5GHz chip currently isn't supported only
+due to missing compatible firmware.
+
+Signed-off-by: Rene Kjellerup <rk.katana.steel@gmail.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/Makefile                      |  1 +
+ arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 45 +++++++++++++++++++++++++
+ 2 files changed, 46 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -82,6 +82,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+       bcm4708-asus-rt-ac68u.dtb \
+       bcm4708-buffalo-wzr-1750dhp.dtb \
+       bcm4708-linksys-ea6300-v1.dtb \
++      bcm4708-linksys-ea6500-v2.dtb \
+       bcm4708-luxul-xap-1510.dtb \
+       bcm4708-luxul-xwc-1000.dtb \
+       bcm4708-netgear-r6250.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+@@ -0,0 +1,45 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
++ * Copyright (C) 2018 Rene Kjellerup <rk.katana.steel@gmail.com>
++ */
++
++/dts-v1/;
++
++#include "bcm4708.dtsi"
++#include "bcm5301x-nand-cs0-bch8.dtsi"
++
++/ {
++      compatible = "linksys,ea6500-v2", "brcm,bcm4708";
++      model = "Linksys EA6500 V2";
++
++      chosen {
++              bootargs = "console=ttyS0,115200";
++      };
++
++      memory {
++              reg = <0x00000000 0x08000000>;
++      };
++
++      gpio-keys {
++              compatible = "gpio-keys";
++              #address-cells = <1>;
++              #size-cells = <0>;
++
++              wps {
++                      label = "WPS";
++                      linux,code = <KEY_WPS_BUTTON>;
++                      gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
++              };
++
++              restart {
++                      label = "Reset";
++                      linux,code = <KEY_RESTART>;
++                      gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
++              };
++      };
++};
++
++&usb3_phy {
++      status = "okay";
++};
diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.21-0006-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch b/target/linux/bcm53xx/patches-4.14/035-v4.21-0006-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch
new file mode 100644 (file)
index 0000000..5f6dd17
--- /dev/null
@@ -0,0 +1,77 @@
+From 9994241ac97cb84d1df98fdc172d3cc6b04b11bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Fri, 9 Nov 2018 09:56:49 +0100
+Subject: [PATCH] ARM: dts: BCM5301X: Describe Northstar pins mux controller
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This describes hardware & will allow referencing pin functions. The
+first usage is UART1 which allows supporting devices using it.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm5301x.dtsi | 44 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -37,6 +37,8 @@
+                       reg = <0x0400 0x100>;
+                       interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&iprocslow>;
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&pinmux_uart1>;
+                       status = "disabled";
+               };
+       };
+@@ -391,6 +393,48 @@
+               status = "disabled";
+       };
++      dmu@1800c000 {
++              compatible = "simple-bus";
++              ranges = <0 0x1800c000 0x1000>;
++              #address-cells = <1>;
++              #size-cells = <1>;
++
++              cru@100 {
++                      compatible = "simple-bus";
++                      reg = <0x100 0x1a4>;
++                      ranges;
++                      #address-cells = <1>;
++                      #size-cells = <1>;
++
++                      pin-controller@1c0 {
++                              compatible = "brcm,bcm4708-pinmux";
++                              reg = <0x1c0 0x24>;
++                              reg-names = "cru_gpio_control";
++
++                              spi-pins {
++                                      groups = "spi_grp";
++                                      function = "spi";
++                              };
++
++                              i2c {
++                                      groups = "i2c_grp";
++                                      function = "i2c";
++                              };
++
++                              pwm {
++                                      groups = "pwm0_grp", "pwm1_grp",
++                                               "pwm2_grp", "pwm3_grp";
++                                      function = "pwm";
++                              };
++
++                              pinmux_uart1: uart1 {
++                                      groups = "uart1_grp";
++                                      function = "uart1";
++                              };
++                      };
++              };
++      };
++
+       lcpll0: lcpll0@1800c100 {
+               #clock-cells = <1>;
+               compatible = "brcm,nsp-lcpll0";
diff --git a/target/linux/bcm53xx/patches-4.14/130-ARM-dts-BCM5301X-Specify-flash-partitions.patch b/target/linux/bcm53xx/patches-4.14/130-ARM-dts-BCM5301X-Specify-flash-partitions.patch
deleted file mode 100644 (file)
index 5f343eb..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-From ed4728d9fa0b19687caa964cf5c2082b80208167 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sat, 28 Jul 2018 13:25:48 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Specify flash partitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Most devices use Broadcom standard partitions which allows them to be
-described with the "brcm,bcm947xx-cfe-partitions". Exceptions are:
-1) TP-LINK devices which use "os-image" partition with TRX containing
-   kernel only + separated rootfs partition.
-2) Asus RT-AC87U with custom "asus" partition.
-
-This commit also removes undocumented and unsupported linux,part-probe
-binding which got accidentally upstreamed while describing SPI
-controller.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
- arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 28 +++++++++++++++++++
- arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts        | 31 ++++++++++++++++++++++
- arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 28 +++++++++++++++++++
- arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi           |  4 +++
- arch/arm/boot/dts/bcm5301x.dtsi                    |  5 +++-
- 5 files changed, 95 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-@@ -94,6 +94,34 @@
- &spi_nor {
-       status = "okay";
-+
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              boot@0 {
-+                      label = "boot";
-+                      reg = <0x000000 0x040000>;
-+                      read-only;
-+              };
-+
-+              os-image@100000 {
-+                      label = "os-image";
-+                      reg = <0x040000 0x200000>;
-+                      compatible = "brcm,trx";
-+              };
-+
-+              rootfs@240000 {
-+                      label = "rootfs";
-+                      reg = <0x240000 0xc00000>;
-+              };
-+
-+              nvram@ff0000 {
-+                      label = "nvram";
-+                      reg = <0xff0000 0x010000>;
-+              };
-+      };
- };
- &usb2 {
---- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-@@ -66,3 +66,34 @@
- &usb3_phy {
-       status = "okay";
- };
-+
-+&nandcs {
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              boot@0 {
-+                      label = "boot";
-+                      reg = <0x00000000 0x00080000>;
-+                      read-only;
-+              };
-+
-+              nvram@80000 {
-+                      label = "nvram";
-+                      reg = <0x00080000 0x00180000>;
-+              };
-+
-+              firmware@200000 {
-+                      label = "firmware";
-+                      reg = <0x00200000 0x07cc0000>;
-+                      compatible = "brcm,trx";
-+              };
-+
-+              asus@7ec0000 {
-+                      label = "asus";
-+                      reg = <0x07ec0000 0x00140000>;
-+                      read-only;
-+              };
-+      };
-+};
---- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-@@ -103,6 +103,34 @@
- &spi_nor {
-       status = "okay";
-+
-+      partitions {
-+              compatible = "fixed-partitions";
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              boot@0 {
-+                      label = "boot";
-+                      reg = <0x000000 0x040000>;
-+                      read-only;
-+              };
-+
-+              os-image@100000 {
-+                      label = "os-image";
-+                      reg = <0x040000 0x200000>;
-+                      compatible = "brcm,trx";
-+              };
-+
-+              rootfs@240000 {
-+                      label = "rootfs";
-+                      reg = <0x240000 0xc00000>;
-+              };
-+
-+              nvram@ff0000 {
-+                      label = "nvram";
-+                      reg = <0xff0000 0x010000>;
-+              };
-+      };
- };
- &usb3_phy {
---- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
-@@ -12,6 +12,10 @@
-                       reg = <0>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-+
-+                      partitions {
-+                              compatible = "brcm,bcm947xx-cfe-partitions";
-+                      };
-               };
-       };
- };
---- a/arch/arm/boot/dts/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -475,8 +475,11 @@
-                       compatible = "jedec,spi-nor";
-                       reg = <0>;
-                       spi-max-frequency = <20000000>;
--                      linux,part-probe = "ofpart", "bcm47xxpart";
-                       status = "disabled";
-+
-+                      partitions {
-+                              compatible = "brcm,bcm947xx-cfe-partitions";
-+                      };
-               };
-       };
diff --git a/target/linux/bcm53xx/patches-4.14/131-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch b/target/linux/bcm53xx/patches-4.14/131-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch
deleted file mode 100644 (file)
index 7b2904a..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 9 Nov 2018 09:53:56 +0100
-Subject: [PATCH] ARM: dts: BCM5301X: Describe Northstar pins mux controller
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This describes hardware & will allow referencing pin functions. The
-first usage is UART1 which allows supporting devices using it.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
-
---- a/arch/arm/boot/dts/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x.dtsi
-@@ -37,6 +37,8 @@
-                       reg = <0x0400 0x100>;
-                       interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&iprocslow>;
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&pinmux_uart1>;
-                       status = "disabled";
-               };
-       };
-@@ -391,6 +393,48 @@
-               status = "disabled";
-       };
-+      dmu@1800c000 {
-+              compatible = "simple-bus";
-+              ranges = <0 0x1800c000 0x1000>;
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              cru@100 {
-+                      compatible = "simple-bus";
-+                      reg = <0x100 0x1a4>;
-+                      ranges;
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+
-+                      pin-controller@1c0 {
-+                              compatible = "brcm,bcm4708-pinmux";
-+                              reg = <0x1c0 0x24>;
-+                              reg-names = "cru_gpio_control";
-+
-+                              spi-pins {
-+                                      groups = "spi_grp";
-+                                      function = "spi";
-+                              };
-+
-+                              i2c {
-+                                      groups = "i2c_grp";
-+                                      function = "i2c";
-+                              };
-+
-+                              pwm {
-+                                      groups = "pwm0_grp", "pwm1_grp",
-+                                               "pwm2_grp", "pwm3_grp";
-+                                      function = "pwm";
-+                              };
-+
-+                              pinmux_uart1: uart1 {
-+                                      groups = "uart1_grp";
-+                                      function = "uart1";
-+                              };
-+                      };
-+              };
-+      };
-+
-       lcpll0: lcpll0@1800c100 {
-               #clock-cells = <1>;
-               compatible = "brcm,nsp-lcpll0";
index 5092817..c546ba9 100644 (file)
@@ -9,7 +9,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -97,6 +97,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -98,6 +98,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4709-buffalo-wxr-1900dhp.dtb \
        bcm4709-linksys-ea9200.dtb \
        bcm4709-netgear-r7000.dtb \
diff --git a/target/linux/bcm53xx/patches-4.14/315-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch b/target/linux/bcm53xx/patches-4.14/315-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch
deleted file mode 100644 (file)
index 3ac8602..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
----
- arch/arm/boot/dts/Makefile                      |  1 +
- arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 41 +++++++++++++++++++++++++
- 2 files changed, 42 insertions(+)
- create mode 100644 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -82,6 +82,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
-       bcm4708-asus-rt-ac68u.dtb \
-       bcm4708-buffalo-wzr-1750dhp.dtb \
-       bcm4708-linksys-ea6300-v1.dtb \
-+      bcm4708-linksys-ea6500-v2.dtb \
-       bcm4708-luxul-xap-1510.dtb \
-       bcm4708-luxul-xwc-1000.dtb \
-       bcm4708-netgear-r6250.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
-@@ -0,0 +1,45 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+/*
-+ * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
-+ * Copyright (C) 2018 Rene Kjellerup <rk.katana.steel@gmail.com>
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+#include "bcm4708.dtsi"
-+#include "bcm5301x-nand-cs0-bch8.dtsi"
-+
-+/ {
-+      compatible = "linksys,ea6500-v2", "brcm,bcm4708";
-+      model = "Linksys EA6500 V2";
-+
-+      chosen {
-+              bootargs = "console=ttyS0,115200";
-+      };
-+
-+      memory {
-+              reg = <0x00000000 0x08000000>;
-+      };
-+
-+      gpio-keys {
-+              compatible = "gpio-keys";
-+              #address-cells = <1>;
-+              #size-cells = <0>;
-+
-+              wps {
-+                      label = "WPS";
-+                      linux,code = <KEY_WPS_BUTTON>;
-+                      gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
-+              };
-+
-+              restart {
-+                      label = "Reset";
-+                      linux,code = <KEY_RESTART>;
-+                      gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
-+              };
-+      };
-+};
-+&usb3_phy {
-+      status = "okay";
-+};
index e3ee0f7..0813b6a 100644 (file)
@@ -11,7 +11,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/arch/arm/boot/dts/bcm53573.dtsi
 +++ b/arch/arm/boot/dts/bcm53573.dtsi
-@@ -54,6 +54,7 @@
+@@ -53,6 +53,7 @@
                             <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
                             <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
                             <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;