bcm53xx: backport DTS changes queued for the 4.21

It just replaces some downstream patches & adds relicensing work.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

9 files changed, 180 insertions, 8 deletions

diff --git a/target/linux/bcm53xx/patches-4.14/130-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
index 5f343eb772..e6e2522f08 100644
--- a/target/linux/bcm53xx/patches-4.14/130-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
@@ -1,6 +1,6 @@
-From ed4728d9fa0b19687caa964cf5c2082b80208167 Mon Sep 17 00:00:00 2001
+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 13:25:48 +0200
+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
@@ -17,6 +17,7 @@ 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 ++++++++++++++++++++++
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
index 0000000000..2dc6b2c23c
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/035-v4.21-0001-ARM-dts-BCM5301X-Relicense-BCM47081-BCM4709-files-to.patch
@@ -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
index 0000000000..86c6b0ae41
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/035-v4.21-0002-ARM-dts-BCM5301X-Relicense-BCM47094-file-to-the-GPL-.patch
@@ -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
index 0000000000..a5358b70c3
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/035-v4.21-0003-ARM-dts-BCM53573-Relicense-Tenda-AC9-file-to-the-GPL.patch
@@ -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
index 0000000000..56cd6376aa
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/035-v4.21-0004-ARM-dts-BCM53573-Relicense-SoC-file-to-the-GPL-2.0-M.patch
@@ -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/315-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
index 3ac8602fa7..d657d7ab1c 100644
--- 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/035-v4.21-0005-ARM-dts-BCM5301X-Add-basic-DT-for-Linksys-EA6500-V2.patch
@@ -1,7 +1,18 @@
+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 | 41 +++++++++++++++++++++++++
- 2 files changed, 42 insertions(+)
+ 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
@@ -21,7 +32,6 @@
 +/*
 + * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
 + * Copyright (C) 2018 Rene Kjellerup <rk.katana.steel@gmail.com>
-+ *
 + */
 +
 +/dts-v1/;
@@ -59,6 +69,7 @@
 +		};
 +	};
 +};
++
 +&usb3_phy {
 +	status = "okay";
 +};
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/035-v4.21-0006-ARM-dts-BCM5301X-Describe-Northstar-pins-mux-control.patch
index 7b2904acbc..5f6dd17dc7 100644
--- a/target/linux/bcm53xx/patches-4.14/131-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
@@ -1,5 +1,6 @@
+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:53:56 +0100
+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
@@ -9,7 +10,10 @@ 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
diff --git a/target/linux/bcm53xx/patches-4.14/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch b/target/linux/bcm53xx/patches-4.14/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch
index 5092817f07..c546ba9f62 100644
--- a/target/linux/bcm53xx/patches-4.14/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch
+++ b/target/linux/bcm53xx/patches-4.14/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch
@@ -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/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch
index e3ee0f7356..0813b6a817 100644
--- a/target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch
+++ b/target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch
@@ -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>;