From: Rafał Miłecki Date: Thu, 27 Dec 2018 06:01:38 +0000 (+0100) Subject: bcm53xx: rename dts backport patches changing their prefixes X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dbbba84ed4f85924e49da220727adf2abaeb3c2a;p=openwrt%2Fstaging%2Fdedeckeh.git bcm53xx: rename dts backport patches changing their prefixes Start 03x with 030 instead of 035. It's a trivial change that adds more place for further backports in the 03x space. Signed-off-by: Rafał Miłecki (cherry picked from commit a5d6f2eb76a549af9e5e186042ab6bf2371be725) --- diff --git a/target/linux/bcm53xx/patches-4.14/030-v4.15-0001-ARM-dts-BCM5301X-Specify-USB-ports-for-USB-LED-of-Lu.patch b/target/linux/bcm53xx/patches-4.14/030-v4.15-0001-ARM-dts-BCM5301X-Specify-USB-ports-for-USB-LED-of-Lu.patch new file mode 100644 index 0000000000..3148f6c32d --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/030-v4.15-0001-ARM-dts-BCM5301X-Specify-USB-ports-for-USB-LED-of-Lu.patch @@ -0,0 +1,30 @@ +From 2460266f21f140936e627f28f28d1a4f30887ae9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 6 Oct 2017 10:52:35 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Specify USB ports for USB LED of Luxul + XWR-1200 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This info can be used by operating system to setup LED behavior. + +Reported-by: Dan Haab +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts ++++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts +@@ -57,7 +57,8 @@ + usb { + label = "bcm53xx:green:usb"; + gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>; +- linux,default-trigger = "none"; ++ trigger-sources = <&ohci_port2>, <&ehci_port2>; ++ linux,default-trigger = "usbport"; + }; + + status { diff --git a/target/linux/bcm53xx/patches-4.14/030-v4.15-0002-ARM-dts-BCM5301X-Add-DT-for-Luxul-XBR-4500.patch b/target/linux/bcm53xx/patches-4.14/030-v4.15-0002-ARM-dts-BCM5301X-Add-DT-for-Luxul-XBR-4500.patch new file mode 100644 index 0000000000..b0dd01d4e5 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/030-v4.15-0002-ARM-dts-BCM5301X-Add-DT-for-Luxul-XBR-4500.patch @@ -0,0 +1,96 @@ +From 1f4b0d5596d2e3ea8e953d578ab8444ce860d35d Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Mon, 9 Oct 2017 09:46:22 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XBR-4500 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is BCM47094 (AKA BCM4709C0) based router with ports-on-the-front +board design. + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 63 +++++++++++++++++++++++++++ + 2 files changed, 64 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -101,6 +101,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4709-tplink-archer-c9-v1.dtb \ + bcm47094-dlink-dir-885l.dtb \ + bcm47094-linksys-panamera.dtb \ ++ bcm47094-luxul-xbr-4500.dtb \ + bcm47094-luxul-xwr-3100.dtb \ + bcm47094-netgear-r8500.dtb \ + bcm94708.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts +@@ -0,0 +1,63 @@ ++/* ++ * Copyright (C) 2017 Luxul Inc. ++ * ++ * Licensed under the ISC license. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" ++ ++/ { ++ compatible = "luxul,xbr-4500-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul XBR-4500 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x18000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "timer"; ++ }; ++ ++ usb3 { ++ label = "bcm53xx:green:usb3"; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>; ++ trigger-sources = <&ohci_port1>, <&ehci_port1>, ++ <&xhci_port1>; ++ linux,default-trigger = "usbport"; ++ }; ++ ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/030-v4.15-0003-ARM-dts-BCM5301X-Add-DT-for-Luxul-ABR-4500.patch b/target/linux/bcm53xx/patches-4.14/030-v4.15-0003-ARM-dts-BCM5301X-Add-DT-for-Luxul-ABR-4500.patch new file mode 100644 index 0000000000..76bc739dde --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/030-v4.15-0003-ARM-dts-BCM5301X-Add-DT-for-Luxul-ABR-4500.patch @@ -0,0 +1,96 @@ +From 65f78c4c41a9b9a7637e1dda2d5e41cf26ea971c Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Mon, 9 Oct 2017 09:46:23 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul ABR-4500 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is BCM47094 (AKA BCM4709C0) based router with rear-facing ports +board design. + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 63 +++++++++++++++++++++++++++ + 2 files changed, 64 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -101,6 +101,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4709-tplink-archer-c9-v1.dtb \ + bcm47094-dlink-dir-885l.dtb \ + bcm47094-linksys-panamera.dtb \ ++ bcm47094-luxul-abr-4500.dtb \ + bcm47094-luxul-xbr-4500.dtb \ + bcm47094-luxul-xwr-3100.dtb \ + bcm47094-netgear-r8500.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts +@@ -0,0 +1,63 @@ ++/* ++ * Copyright (C) 2017 Luxul Inc. ++ * ++ * Licensed under the ISC license. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm4708.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" ++ ++/ { ++ compatible = "luxul,abr-4500-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul ABR-4500 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x18000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ ++ usb3 { ++ label = "bcm53xx:green:usb3"; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; ++ trigger-sources = <&ohci_port1>, <&ehci_port1>, ++ <&xhci_port1>; ++ linux,default-trigger = "usbport"; ++ }; ++ ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/030-v4.15-0004-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-810.patch b/target/linux/bcm53xx/patches-4.14/030-v4.15-0004-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-810.patch new file mode 100644 index 0000000000..5cb894c361 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/030-v4.15-0004-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-810.patch @@ -0,0 +1,120 @@ +From 0aa052ce1c3340850a7e5980b6d24b3ea5779591 Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Mon, 9 Oct 2017 09:46:59 -0600 +Subject: [PATCH] ARM: dts: BCM53573: Add DT for Luxul XAP-810 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is BCM53573 WiSoC based access point with an extra BCM43217 chipset +used for 2.4 GHz. + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 87 ++++++++++++++++++++++++++++ + 2 files changed, 88 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47189-luxul-xap-810.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm953012hr.dtb \ + bcm953012k.dtb + dtb-$(CONFIG_ARCH_BCM_53573) += \ ++ bcm47189-luxul-xap-810.dtb \ + bcm47189-tenda-ac9.dtb \ + bcm947189acdbmr.dtb + dtb-$(CONFIG_ARCH_BCM_63XX) += \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts +@@ -0,0 +1,87 @@ ++/* ++ * Copyright 2017 Luxul Inc. ++ * ++ * Licensed under the ISC license. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm53573.dtsi" ++ ++/ { ++ compatible = "luxul,xap-810-v1", "brcm,bcm47189", "brcm,bcm53573"; ++ model = "Luxul XAP-810 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ 5ghz { ++ label = "bcm53xx:blue:5ghz"; ++ gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-off"; ++ }; ++ ++ system { ++ label = "bcm53xx:green:system"; ++ gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "timer"; ++ }; ++ }; ++ ++ pcie0_leds { ++ compatible = "gpio-leds"; ++ ++ 2ghz { ++ label = "bcm53xx:blue:2ghz"; ++ gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-off"; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&pcie0 { ++ ranges = <0x00000000 0 0 0 0 0x00100000>; ++ #address-cells = <3>; ++ #size-cells = <2>; ++ ++ bridge@0,0,0 { ++ reg = <0x0000 0 0 0 0>; ++ ranges = <0x00000000 0 0 0 0 0 0 0x00100000>; ++ #address-cells = <3>; ++ #size-cells = <2>; ++ ++ wifi@0,1,0 { ++ reg = <0x0000 0 0 0 0>; ++ ranges = <0x00000000 0 0 0 0x00100000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ pcie0_chipcommon: chipcommon@0 { ++ reg = <0 0x1000>; ++ ++ gpio-controller; ++ #gpio-cells = <2>; ++ }; ++ }; ++ }; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/030-v4.15-0005-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-1440.patch b/target/linux/bcm53xx/patches-4.14/030-v4.15-0005-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-1440.patch new file mode 100644 index 0000000000..9d43dd58d0 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/030-v4.15-0005-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-1440.patch @@ -0,0 +1,83 @@ +From 7030ea600d560026b91726f2eb79c856b813afa9 Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Mon, 9 Oct 2017 09:47:00 -0600 +Subject: [PATCH] ARM: dts: BCM53573: Add DT for Luxul XAP-1440 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is BCM53573 WiSoC based outdoor access point with an extra BCM43217 +chipset used for 2.4 GHz. + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 50 +++++++++++++++++++++++++++ + 2 files changed, 51 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm953012hr.dtb \ + bcm953012k.dtb + dtb-$(CONFIG_ARCH_BCM_53573) += \ ++ bcm47189-luxul-xap-1440.dtb \ + bcm47189-luxul-xap-810.dtb \ + bcm47189-tenda-ac9.dtb \ + bcm947189acdbmr.dtb +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts +@@ -0,0 +1,50 @@ ++/* ++ * Copyright 2017 Luxul Inc. ++ * ++ * Licensed under the ISC license. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm53573.dtsi" ++ ++/ { ++ compatible = "luxul,xap-1440-v1", "brcm,bcm47189", "brcm,bcm53573"; ++ model = "Luxul XAP-1440 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ wlan { ++ label = "bcm53xx:blue:wlan"; ++ gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "default-off"; ++ }; ++ ++ system { ++ label = "bcm53xx:green:system"; ++ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/031-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch b/target/linux/bcm53xx/patches-4.14/031-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch new file mode 100644 index 0000000000..043d38b832 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/031-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch @@ -0,0 +1,96 @@ +From 811ae58e76da88106f6d28159d4ea7b163dfaa48 Mon Sep 17 00:00:00 2001 +From: INAGAKI Hiroshi +Date: Wed, 7 Mar 2018 20:33:56 +0900 +Subject: [PATCH] ARM: dts: BCM5301X: add missing LEDs for Buffalo WZR-900DHP +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Buffalo WZR-900DHP has 8 LEDs, but there is not LED definitions in the +dts and cannot configure these LEDs. +I Added missing LED definitions for WZR-900DHP. + +Signed-off-by: INAGAKI Hiroshi +Reviewed-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 68 +++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +@@ -35,6 +35,74 @@ + 0x88000000 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"; ++ ++ usb { ++ label = "bcm53xx:green:usb"; ++ gpios = <&hc595 0 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ 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>; ++ }; ++ ++ 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>; ++ }; ++ ++ 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>; ++ }; ++ ++ wireless1 { ++ label = "bcm53xx:amber:wireless"; ++ gpios = <&hc595 7 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ + gpio-keys { + compatible = "gpio-keys"; + #address-cells = <1>; diff --git a/target/linux/bcm53xx/patches-4.14/032-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch b/target/linux/bcm53xx/patches-4.14/032-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch new file mode 100644 index 0000000000..e2fe0be909 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/032-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch @@ -0,0 +1,39 @@ +From 0c0d1c90ddc44df70401b7cfff178c41b2f83ffa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Wed, 4 Apr 2018 15:14:21 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Switch Luxul XWC-1000 to the new fixed + partitions syntax +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This new syntax is slightly better designed & uses "compatible" string. +For details see Documentation/devicetree/bindings/mtd/partition.txt . + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -26,9 +26,15 @@ + + nand: nand@18028000 { + nandcs@0 { +- partition@0 { +- label = "ubi"; +- reg = <0x00000000 0x08000000>; ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "ubi"; ++ reg = <0x00000000 0x08000000>; ++ }; + }; + }; + }; diff --git a/target/linux/bcm53xx/patches-4.14/032-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch b/target/linux/bcm53xx/patches-4.14/032-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch new file mode 100644 index 0000000000..6599520b92 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/032-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch @@ -0,0 +1,440 @@ +From 2b3db67ce4bc4d1d8556e87a17df7765da8dbdc5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Wed, 2 May 2018 16:11:02 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ + / MIT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These files were created and ever touched by a group of three people +only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC. + +Introducing and discussing SPDX-License-Identifier resulted in a +conclusion that ISC is a not recommended license (see also a +license-rules.rst). Moveover an old e-mail from Alan Cox was pointed +which explained that dual licensing is a safer solution than depending +on a common compatibility belief. + +This commit switches most of BCM5301X DTS files to dual licensing using: +1) GPL 2.0+ to make sure they are compatible with Linux kernel +2) MIT to allow sharing with more permissive projects +Both licenses belong to the preferred ones (see LICENSES/preferred/). + +An attempt to relicense remaining files will be made separately and will +require approve from more/other developers. + +Signed-off-by: Rafał Miłecki +Reviewed-by: Greg Kroah-Hartman +Acked-by: Hauke Mehrtens +Acked-by: Dan Haab +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------ + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------ + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +-- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +-- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +-- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------ + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +-- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------ + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------ + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +-- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +-- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +-- + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +-- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------ + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +-- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------ + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +-- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +-- + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +-- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +-- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +-- + 25 files changed, 25 insertions(+), 120 deletions(-) + +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-AC56U + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-AC68U + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts ++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2016 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * 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/; +--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts ++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X arm platform code. + * DTS for SmartRG SR400ac + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts ++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-600DHP2 + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts ++++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts ++++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts ++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts ++++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts ++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R7000 + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts ++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2016 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts ++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for D-Link DIR-885L + * + * Copyright (C) 2016 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts ++++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2016 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts ++++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2016 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi +@@ -1,9 +1,8 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom Northstar NAND. + * + * Copyright (C) 2016 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + #include "bcm5301x-nand-cs0.dtsi" +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2016 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + #include "bcm5301x-nand-cs0.dtsi" +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi +@@ -1,3 +1,4 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X Nand chip defaults. + * +@@ -5,8 +6,6 @@ + * and uses 8 bit ECC. + * + * Copyright (C) 2015 Hauke Mehrtens +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + #include "bcm5301x-nand-cs0.dtsi" +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi +@@ -1,9 +1,8 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom Northstar NAND. + * + * Copyright (C) 2015 Hauke Mehrtens +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + / { diff --git a/target/linux/bcm53xx/patches-4.14/032-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch b/target/linux/bcm53xx/patches-4.14/032-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch new file mode 100644 index 0000000000..cc7ff8552a --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/032-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch @@ -0,0 +1,79 @@ +From fd0ab539d185a828f2071ee5f311bf101c7fea08 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 4 May 2018 11:54:45 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Relicense Buffalo 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 is clearly compatible with Linux kernel +2) MIT is also permissive but preferred over ISC + +These files were created and ever touched by a group of four people +only: Felix, INAGAKI, Hauke and me. + +Signed-off-by: Rafał Miłecki +Acked-by: Felix Fietkau +Acked-by: INAGAKI Hiroshi +Acked-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 3 +-- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 13 +------------ + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +-- + 3 files changed, 3 insertions(+), 16 deletions(-) + +--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts ++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-1750DHP + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-900DHP + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts ++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WXR-1900DHP + * + * Copyright (C) 2015 Felix Fietkau +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + /dts-v1/; diff --git a/target/linux/bcm53xx/patches-4.14/032-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch b/target/linux/bcm53xx/patches-4.14/032-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch new file mode 100644 index 0000000000..4285a59a6d --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/032-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch @@ -0,0 +1,112 @@ +From 2e2105a1578172eaf61e3b59a2c10c4fe04c21b9 Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Fri, 4 May 2018 10:08:43 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XWR-3150 V1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Luxul XWR-3150 is a wireless router similar to the XWR-3100 except: +1) It has more RAM +2) Its NAND controller in running in BCH8 mode +3) LAN ports LEDs are hardware controlled + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 77 ++++++++++++++++++++++++ + 2 files changed, 78 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -104,6 +104,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm47094-luxul-abr-4500.dtb \ + bcm47094-luxul-xbr-4500.dtb \ + bcm47094-luxul-xwr-3100.dtb \ ++ bcm47094-luxul-xwr-3150-v1.dtb \ + bcm47094-netgear-r8500.dtb \ + bcm94708.dtb \ + bcm94709.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts +@@ -0,0 +1,77 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * Copyright 2018 Luxul Inc. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm47094.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" ++ ++/ { ++ compatible = "luxul,xwr-3150-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul XWR-3150 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x18000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ power { ++ label = "bcm53xx:green:power"; ++ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "default-on"; ++ }; ++ ++ usb3 { ++ label = "bcm53xx:green:usb3"; ++ gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>; ++ trigger-sources = <&ohci_port1>, <&ehci_port1>, ++ <&xhci_port1>; ++ linux,default-trigger = "usbport"; ++ }; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ ++ 2ghz { ++ label = "bcm53xx:green:2ghz"; ++ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5ghz { ++ label = "bcm53xx:green:5ghz"; ++ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/032-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch b/target/linux/bcm53xx/patches-4.14/032-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch new file mode 100644 index 0000000000..a6102857c3 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/032-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch @@ -0,0 +1,90 @@ +From 6054cb5788072e214af582c42d9bd8c5ffa6e288 Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Fri, 4 May 2018 10:08:44 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XAP-1610 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It's an access point based on BCM47094 SoC with two BCM4366E wireless +chipsets. + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 57 +++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -102,6 +102,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm47094-dlink-dir-885l.dtb \ + bcm47094-linksys-panamera.dtb \ + bcm47094-luxul-abr-4500.dtb \ ++ bcm47094-luxul-xap-1610.dtb \ + bcm47094-luxul-xbr-4500.dtb \ + bcm47094-luxul-xwr-3100.dtb \ + bcm47094-luxul-xwr-3150-v1.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts +@@ -0,0 +1,57 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * Copyright 2018 Luxul Inc. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm47094.dtsi" ++ ++/ { ++ compatible = "luxul,xap-1610-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul XAP-1610 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ ++ 2ghz { ++ label = "bcm53xx:blue:2ghz"; ++ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5ghz { ++ label = "bcm53xx:blue:5ghz"; ++ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/032-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch b/target/linux/bcm53xx/patches-4.14/032-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch new file mode 100644 index 0000000000..f774bc6b82 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/032-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch @@ -0,0 +1,48 @@ +From 9c281b5e129961b9940a27f8da24dddd1c0eba87 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 4 May 2018 12:03:24 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Relicense Asus RT-AC87U 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 is clearly compatible with Linux kernel +2) MIT is also permissive but preferred over ISC + +This file were created and ever touched by a group of three people only: +Álvaro, Hauke and me. + +Signed-off-by: Rafał Miłecki +Acked-by: Hauke Mehrtens +Acked-by: Álvaro Fernández Rojas +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts ++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-AC87U + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * 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. + */ + + /dts-v1/; diff --git a/target/linux/bcm53xx/patches-4.14/032-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch b/target/linux/bcm53xx/patches-4.14/032-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch new file mode 100644 index 0000000000..e397ddd0b2 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/032-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch @@ -0,0 +1,39 @@ +From a05f1e36a57d02374a203719abc5bf2e8c51e125 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Thu, 10 May 2018 23:20:00 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Switch D-Link DIR-885L to the new + partitions syntax +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This new syntax is slightly better designed & uses "compatible" string. +For details see Documentation/devicetree/bindings/mtd/partition.txt . + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts ++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +@@ -26,9 +26,15 @@ + + nand: nand@18028000 { + nandcs@0 { +- partition@0 { +- label = "firmware"; +- reg = <0x00000000 0x08000000>; ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "firmware"; ++ reg = <0x00000000 0x08000000>; ++ }; + }; + }; + }; diff --git a/target/linux/bcm53xx/patches-4.14/033-v4.19-0001-ARM-dts-BCM5301X-Make-USB-3.0-PHY-use-MDIO-PHY-drive.patch b/target/linux/bcm53xx/patches-4.14/033-v4.19-0001-ARM-dts-BCM5301X-Make-USB-3.0-PHY-use-MDIO-PHY-drive.patch new file mode 100644 index 0000000000..226109c09c --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/033-v4.19-0001-ARM-dts-BCM5301X-Make-USB-3.0-PHY-use-MDIO-PHY-drive.patch @@ -0,0 +1,456 @@ +From 37f6130ec39fe14e923d472746a51e6f06f761b7 Mon Sep 17 00:00:00 2001 +From: Vivek Unune +Date: Mon, 9 Apr 2018 18:31:53 -0400 +Subject: [PATCH] ARM: dts: BCM5301X: Make USB 3.0 PHY use MDIO PHY driver +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Currently, the USB 3.0 PHY in bcm5301x.dtsi uses platform driver which +requires register range "ccb-mii" <0x18003000 0x1000>. This range +overlaps with MDIO cmd and param registers (<0x18003000 0x8>). +Essentially, the platform driver partly acts like a MDIO bus driver, +hence to use of this register range. + +In some Northstar devices like Linksys EA9500, secondary switch is +connected via external MDIO. The only way to access and configure the +external switch is via MDIO bus. When we enable the MDIO bus in it's +current state, the MDIO bus and any child buses fail to register because +of the register range overlap. + +On Northstar, the USB 3.0 PHY is connected at address 0x10 on the +internal MDIO bus. This change moves the usb3_phy node and makes it a +child node of internal MDIO bus. + +Thanks to Rafał Miłecki's commit af850e14a7ae ("phy: bcm-ns-usb3: add +MDIO driver using proper bus layer") the same USB 3.0 platform driver +can now act as USB 3.0 PHY MDIO driver. + +Tested on Linksys Panamera (EA9500) + +Signed-off-by: Vivek Unune +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 4 +++ + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 4 +++ + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +++ + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 4 +++ + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 +++ + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +++ + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 +++ + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 +++ + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 +++ + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 +++ + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +++ + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 +++ + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 4 +++ + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 4 +++ + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 +++ + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 4 +++ + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 4 +++ + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 4 +++ + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 4 +++ + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 4 +++ + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 +++ + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +++ + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 4 +++ + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 +++ + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 +++ + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 4 +++ + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 +++ + arch/arm/boot/dts/bcm47094.dtsi | 7 +++-- + arch/arm/boot/dts/bcm5301x.dtsi | 35 +++++++++++++++++----- + arch/arm/boot/dts/bcm94708.dts | 4 +++ + arch/arm/boot/dts/bcm94709.dts | 4 +++ + arch/arm/boot/dts/bcm953012er.dts | 4 +++ + arch/arm/boot/dts/bcm953012hr.dts | 4 +++ + arch/arm/boot/dts/bcm953012k.dts | 4 +++ + 34 files changed, 159 insertions(+), 11 deletions(-) + +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +@@ -90,3 +90,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +@@ -80,3 +80,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts ++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +@@ -146,3 +146,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts ++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts +@@ -38,3 +38,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts +@@ -57,3 +57,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -64,3 +64,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +@@ -91,3 +91,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +@@ -83,3 +83,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts ++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +@@ -158,3 +158,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts ++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +@@ -74,3 +74,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +@@ -118,3 +118,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +@@ -104,3 +104,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts ++++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts +@@ -57,3 +57,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts ++++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts +@@ -105,3 +105,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts ++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts +@@ -99,3 +99,7 @@ + &usb2 { + vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts ++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts +@@ -62,3 +62,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts ++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +@@ -127,3 +127,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts ++++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts +@@ -39,3 +39,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts ++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts +@@ -101,3 +101,7 @@ + &usb3 { + vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts ++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +@@ -182,3 +182,7 @@ + &usb3 { + vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts ++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts +@@ -104,3 +104,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts ++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +@@ -115,3 +115,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts ++++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts +@@ -33,3 +33,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts +@@ -60,3 +60,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts +@@ -60,3 +60,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts +@@ -100,3 +100,7 @@ + &spi_nor { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts ++++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts +@@ -91,3 +91,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm47094.dtsi ++++ b/arch/arm/boot/dts/bcm47094.dtsi +@@ -7,9 +7,10 @@ + #include "bcm4708.dtsi" + + / { +- usb3_phy: usb3-phy { +- compatible = "brcm,ns-bx-usb3-phy"; +- }; ++}; ++ ++&usb3_phy { ++ compatible = "brcm,ns-bx-usb3-phy"; + }; + + &uart0 { +--- a/arch/arm/boot/dts/bcm5301x.dtsi ++++ b/arch/arm/boot/dts/bcm5301x.dtsi +@@ -154,13 +154,6 @@ + clock-names = "phy-ref-clk"; + }; + +- usb3_phy: usb3-phy { +- compatible = "brcm,ns-ax-usb3-phy"; +- reg = <0x18105000 0x1000>, <0x18003000 0x1000>; +- reg-names = "dmp", "ccb-mii"; +- #phy-cells = <0>; +- }; +- + axi@18000000 { + compatible = "brcm,bus-axi"; + reg = <0x18000000 0x1000>; +@@ -359,7 +352,33 @@ + reg = <0x18003000 0x8>; + #size-cells = <1>; + #address-cells = <0>; +- status = "disabled"; ++ }; ++ ++ mdio-bus-mux { ++ compatible = "mdio-mux-mmioreg"; ++ mdio-parent-bus = <&mdio>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0x18003000 0x4>; ++ mux-mask = <0x200>; ++ ++ mdio@0 { ++ reg = <0x0>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ usb3_phy: usb3-phy@10 { ++ compatible = "brcm,ns-ax-usb3-phy"; ++ reg = <0x10>; ++ usb3-dmp-syscon = <&usb3_dmp>; ++ #phy-cells = <0>; ++ status = "disabled"; ++ }; ++ }; ++ }; ++ ++ usb3_dmp: syscon@18105000 { ++ reg = <0x18105000 0x1000>; + }; + + i2c0: i2c@18009000 { +--- a/arch/arm/boot/dts/bcm94708.dts ++++ b/arch/arm/boot/dts/bcm94708.dts +@@ -42,3 +42,7 @@ + reg = <0x00000000 0x08000000>; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm94709.dts ++++ b/arch/arm/boot/dts/bcm94709.dts +@@ -42,3 +42,7 @@ + reg = <0x00000000 0x08000000>; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm953012er.dts ++++ b/arch/arm/boot/dts/bcm953012er.dts +@@ -90,3 +90,7 @@ + }; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm953012hr.dts ++++ b/arch/arm/boot/dts/bcm953012hr.dts +@@ -95,3 +95,7 @@ + reg = <0x00700000 0x00900000>; + }; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; +--- a/arch/arm/boot/dts/bcm953012k.dts ++++ b/arch/arm/boot/dts/bcm953012k.dts +@@ -113,3 +113,7 @@ + &uart1 { + status = "okay"; + }; ++ ++&usb3_phy { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/033-v4.19-0002-ARM-dts-BCM53573-Add-architected-timer.patch b/target/linux/bcm53xx/patches-4.14/033-v4.19-0002-ARM-dts-BCM53573-Add-architected-timer.patch new file mode 100644 index 0000000000..f1b301ca27 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/033-v4.19-0002-ARM-dts-BCM53573-Add-architected-timer.patch @@ -0,0 +1,34 @@ +From a21e7548438f3a8f59f9b9f3a8bc973613d3726a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Thu, 14 Jun 2018 18:41:47 +0200 +Subject: [PATCH] ARM: dts: BCM53573: Add architected timer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It's a standard ARM architected timer that was simply missed when +initially adding this .dtsi file. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm53573.dtsi | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/arm/boot/dts/bcm53573.dtsi ++++ b/arch/arm/boot/dts/bcm53573.dtsi +@@ -48,6 +48,14 @@ + }; + }; + ++ timer { ++ compatible = "arm,armv7-timer"; ++ interrupts = , ++ , ++ , ++ ; ++ }; ++ + clocks { + #address-cells = <1>; + #size-cells = <1>; diff --git a/target/linux/bcm53xx/patches-4.14/033-v4.19-0003-ARM-dts-BCM5301X-Add-support-for-Linksys-EA9500.patch b/target/linux/bcm53xx/patches-4.14/033-v4.19-0003-ARM-dts-BCM5301X-Add-support-for-Linksys-EA9500.patch new file mode 100644 index 0000000000..701605a973 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/033-v4.19-0003-ARM-dts-BCM5301X-Add-support-for-Linksys-EA9500.patch @@ -0,0 +1,269 @@ +From 2bebdfcdcd0feb58d5df419532a2cedc78a336d7 Mon Sep 17 00:00:00 2001 +From: Vivek Unune +Date: Mon, 18 Jun 2018 13:41:59 -0400 +Subject: [PATCH] ARM: dts: BCM5301X: Add support for Linksys EA9500 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Hardware Info +------------- + +Processor - Broadcom BCM4709C0KFEBG dual-core @ 1.4 GHz +Switch - BCM53012 in BCM4709C0KFEBG & external BCM53125 +DDR3 RAM - 256 MB +Flash - 128 MB (Toshiba TC58BVG0S3HTA00) +2.4GHz - BCM4366 4×4 2.4/5G single chip 802.11ac SoC +Power Amp - Skyworks SE2623L 2.4 GHz power amp (x4) +5GHz x 2 - BCM4366 4×4 2.4/5G single chip 802.11ac SoC +Power Amp - PLX Technology PEX8603 3-lane, 3-port PCIe switch +Ports - 8 Ports, 1 WAN Ports +Antennas - 8 Antennas +Serial Port - @J6 [GND,TX,RX] (VCC NC) 115200 8n1 + +Tested with OpenWrt built with DSA driver and Kernel v4.14 + +Signed-off-by: Vivek Unune +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 229 ++++++++++++++++++++++++ + 1 file changed, 229 insertions(+) + +--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts ++++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts +@@ -31,6 +31,235 @@ + linux,code = ; + gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>; + }; ++ ++ rfkill { ++ label = "WiFi"; ++ linux,code = ; ++ gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>; ++ }; ++ ++ reset { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ wps { ++ label = "bcm53xx:white:wps"; ++ gpios = <&chipcommon 22 GPIO_ACTIVE_LOW>; ++ }; ++ ++ usb2 { ++ label = "bcm53xx:green:usb2"; ++ gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>; ++ trigger-sources = <&ohci_port2>, <&ehci_port2>; ++ linux,default-trigger = "usbport"; ++ }; ++ ++ usb3 { ++ label = "bcm53xx:green:usb3"; ++ gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>; ++ trigger-sources = <&ohci_port1>, <&ehci_port1>, ++ <&xhci_port1>; ++ linux,default-trigger = "usbport"; ++ }; ++ ++ power { ++ label = "bcm53xx:white:power"; ++ gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ wifi-disabled { ++ label = "bcm53xx:amber:wifi-disabled"; ++ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wifi-enabled { ++ label = "bcm53xx:white:wifi-enabled"; ++ gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ bluebar1 { ++ label = "bcm53xx:white:bluebar1"; ++ gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ bluebar2 { ++ label = "bcm53xx:white:bluebar2"; ++ gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ bluebar3 { ++ label = "bcm53xx:white:bluebar3"; ++ gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>; ++ }; ++ ++ bluebar4 { ++ label = "bcm53xx:white:bluebar4"; ++ gpios = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ bluebar5 { ++ label = "bcm53xx:white:bluebar5"; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ bluebar6 { ++ label = "bcm53xx:white:bluebar6"; ++ gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ bluebar7 { ++ label = "bcm53xx:white:bluebar7"; ++ gpios = <&chipcommon 21 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ bluebar8 { ++ label = "bcm53xx:white:bluebar8"; ++ gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ mdio-bus-mux { ++ /* BIT(9) = 1 => external mdio */ ++ mdio_ext: mdio@200 { ++ reg = <0x200>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ }; ++ }; ++ ++ mdio-mii-mux { ++ compatible = "mdio-mux-mmioreg"; ++ mdio-parent-bus = <&mdio_ext>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0x1800c1c0 0x4>; ++ ++ /* BIT(6) = mdc, BIT(7) = mdio */ ++ mux-mask = <0xc0>; ++ ++ mdio-mii@0 { ++ /* Enable MII function */ ++ reg = <0x0>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ switch@0 { ++ compatible = "brcm,bcm53125"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reset-gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; ++ reset-names = "robo_reset"; ++ reg = <0>; ++ dsa,member = <1 0>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ label = "lan1"; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ label = "lan5"; ++ }; ++ ++ port@2 { ++ reg = <2>; ++ label = "lan2"; ++ }; ++ ++ port@3 { ++ reg = <3>; ++ label = "lan6"; ++ }; ++ ++ port@4 { ++ reg = <4>; ++ label = "lan3"; ++ }; ++ ++ sw1_p8: port@8 { ++ reg = <8>; ++ ethernet = <&sw0_p0>; ++ label = "cpu"; ++ ++ fixed-link { ++ speed = <1000>; ++ full-duplex; ++ }; ++ }; ++ }; ++ }; ++ }; ++ }; ++}; ++ ++&usb2 { ++ vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 14 GPIO_ACTIVE_HIGH>; ++}; ++ ++&srab { ++ compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab"; ++ status = "okay"; ++ dsa,member = <0 0>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@1 { ++ reg = <1>; ++ label = "lan7"; ++ }; ++ ++ port@2 { ++ reg = <2>; ++ label = "lan4"; ++ }; ++ ++ port@3 { ++ reg = <3>; ++ label = "lan8"; ++ }; ++ ++ port@4 { ++ reg = <4>; ++ label = "wan"; ++ }; ++ ++ port@8 { ++ reg = <8>; ++ ethernet = <&gmac2>; ++ label = "cpu"; ++ ++ fixed-link { ++ speed = <1000>; ++ full-duplex; ++ }; ++ }; ++ ++ sw0_p0: port@0 { ++ reg = <0>; ++ label = "extsw"; ++ ++ fixed-link { ++ speed = <1000>; ++ full-duplex; ++ }; ++ }; + }; + }; + diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.15-0001-ARM-dts-BCM5301X-Specify-USB-ports-for-USB-LED-of-Lu.patch b/target/linux/bcm53xx/patches-4.14/035-v4.15-0001-ARM-dts-BCM5301X-Specify-USB-ports-for-USB-LED-of-Lu.patch deleted file mode 100644 index 3148f6c32d..0000000000 --- a/target/linux/bcm53xx/patches-4.14/035-v4.15-0001-ARM-dts-BCM5301X-Specify-USB-ports-for-USB-LED-of-Lu.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2460266f21f140936e627f28f28d1a4f30887ae9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Fri, 6 Oct 2017 10:52:35 +0200 -Subject: [PATCH] ARM: dts: BCM5301X: Specify USB ports for USB LED of Luxul - XWR-1200 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This info can be used by operating system to setup LED behavior. - -Reported-by: Dan Haab -Signed-off-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts -+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts -@@ -57,7 +57,8 @@ - usb { - label = "bcm53xx:green:usb"; - gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>; -- linux,default-trigger = "none"; -+ trigger-sources = <&ohci_port2>, <&ehci_port2>; -+ linux,default-trigger = "usbport"; - }; - - status { diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.15-0002-ARM-dts-BCM5301X-Add-DT-for-Luxul-XBR-4500.patch b/target/linux/bcm53xx/patches-4.14/035-v4.15-0002-ARM-dts-BCM5301X-Add-DT-for-Luxul-XBR-4500.patch deleted file mode 100644 index b0dd01d4e5..0000000000 --- a/target/linux/bcm53xx/patches-4.14/035-v4.15-0002-ARM-dts-BCM5301X-Add-DT-for-Luxul-XBR-4500.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 1f4b0d5596d2e3ea8e953d578ab8444ce860d35d Mon Sep 17 00:00:00 2001 -From: Dan Haab -Date: Mon, 9 Oct 2017 09:46:22 -0600 -Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XBR-4500 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is BCM47094 (AKA BCM4709C0) based router with ports-on-the-front -board design. - -Signed-off-by: Dan Haab -Acked-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 63 +++++++++++++++++++++++++++ - 2 files changed, 64 insertions(+) - create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -101,6 +101,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm4709-tplink-archer-c9-v1.dtb \ - bcm47094-dlink-dir-885l.dtb \ - bcm47094-linksys-panamera.dtb \ -+ bcm47094-luxul-xbr-4500.dtb \ - bcm47094-luxul-xwr-3100.dtb \ - bcm47094-netgear-r8500.dtb \ - bcm94708.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -@@ -0,0 +1,63 @@ -+/* -+ * Copyright (C) 2017 Luxul Inc. -+ * -+ * Licensed under the ISC license. -+ */ -+ -+/dts-v1/; -+ -+#include "bcm4708.dtsi" -+#include "bcm5301x-nand-cs0-bch8.dtsi" -+ -+/ { -+ compatible = "luxul,xbr-4500-v1", "brcm,bcm47094", "brcm,bcm4708"; -+ model = "Luxul XBR-4500 V1"; -+ -+ chosen { -+ bootargs = "earlycon"; -+ }; -+ -+ memory { -+ reg = <0x00000000 0x08000000 -+ 0x88000000 0x18000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ status { -+ label = "bcm53xx:green:status"; -+ gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "timer"; -+ }; -+ -+ usb3 { -+ label = "bcm53xx:green:usb3"; -+ gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>; -+ trigger-sources = <&ohci_port1>, <&ehci_port1>, -+ <&xhci_port1>; -+ linux,default-trigger = "usbport"; -+ }; -+ -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ restart { -+ label = "Reset"; -+ linux,code = ; -+ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; -+ -+&usb3 { -+ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; -+}; -+ -+&spi_nor { -+ status = "okay"; -+}; diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.15-0003-ARM-dts-BCM5301X-Add-DT-for-Luxul-ABR-4500.patch b/target/linux/bcm53xx/patches-4.14/035-v4.15-0003-ARM-dts-BCM5301X-Add-DT-for-Luxul-ABR-4500.patch deleted file mode 100644 index 76bc739dde..0000000000 --- a/target/linux/bcm53xx/patches-4.14/035-v4.15-0003-ARM-dts-BCM5301X-Add-DT-for-Luxul-ABR-4500.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 65f78c4c41a9b9a7637e1dda2d5e41cf26ea971c Mon Sep 17 00:00:00 2001 -From: Dan Haab -Date: Mon, 9 Oct 2017 09:46:23 -0600 -Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul ABR-4500 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is BCM47094 (AKA BCM4709C0) based router with rear-facing ports -board design. - -Signed-off-by: Dan Haab -Acked-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 63 +++++++++++++++++++++++++++ - 2 files changed, 64 insertions(+) - create mode 100644 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -101,6 +101,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm4709-tplink-archer-c9-v1.dtb \ - bcm47094-dlink-dir-885l.dtb \ - bcm47094-linksys-panamera.dtb \ -+ bcm47094-luxul-abr-4500.dtb \ - bcm47094-luxul-xbr-4500.dtb \ - bcm47094-luxul-xwr-3100.dtb \ - bcm47094-netgear-r8500.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -@@ -0,0 +1,63 @@ -+/* -+ * Copyright (C) 2017 Luxul Inc. -+ * -+ * Licensed under the ISC license. -+ */ -+ -+/dts-v1/; -+ -+#include "bcm4708.dtsi" -+#include "bcm5301x-nand-cs0-bch8.dtsi" -+ -+/ { -+ compatible = "luxul,abr-4500-v1", "brcm,bcm47094", "brcm,bcm4708"; -+ model = "Luxul ABR-4500 V1"; -+ -+ chosen { -+ bootargs = "earlycon"; -+ }; -+ -+ memory { -+ reg = <0x00000000 0x08000000 -+ 0x88000000 0x18000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ status { -+ label = "bcm53xx:green:status"; -+ gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "timer"; -+ }; -+ -+ usb3 { -+ label = "bcm53xx:green:usb3"; -+ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; -+ trigger-sources = <&ohci_port1>, <&ehci_port1>, -+ <&xhci_port1>; -+ linux,default-trigger = "usbport"; -+ }; -+ -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ restart { -+ label = "Reset"; -+ linux,code = ; -+ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; -+ -+&usb3 { -+ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; -+}; -+ -+&spi_nor { -+ status = "okay"; -+}; diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.15-0004-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-810.patch b/target/linux/bcm53xx/patches-4.14/035-v4.15-0004-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-810.patch deleted file mode 100644 index 5cb894c361..0000000000 --- a/target/linux/bcm53xx/patches-4.14/035-v4.15-0004-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-810.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 0aa052ce1c3340850a7e5980b6d24b3ea5779591 Mon Sep 17 00:00:00 2001 -From: Dan Haab -Date: Mon, 9 Oct 2017 09:46:59 -0600 -Subject: [PATCH] ARM: dts: BCM53573: Add DT for Luxul XAP-810 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is BCM53573 WiSoC based access point with an extra BCM43217 chipset -used for 2.4 GHz. - -Signed-off-by: Dan Haab -Acked-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 87 ++++++++++++++++++++++++++++ - 2 files changed, 88 insertions(+) - create mode 100644 arch/arm/boot/dts/bcm47189-luxul-xap-810.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm953012hr.dtb \ - bcm953012k.dtb - dtb-$(CONFIG_ARCH_BCM_53573) += \ -+ bcm47189-luxul-xap-810.dtb \ - bcm47189-tenda-ac9.dtb \ - bcm947189acdbmr.dtb - dtb-$(CONFIG_ARCH_BCM_63XX) += \ ---- /dev/null -+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts -@@ -0,0 +1,87 @@ -+/* -+ * Copyright 2017 Luxul Inc. -+ * -+ * Licensed under the ISC license. -+ */ -+ -+/dts-v1/; -+ -+#include "bcm53573.dtsi" -+ -+/ { -+ compatible = "luxul,xap-810-v1", "brcm,bcm47189", "brcm,bcm53573"; -+ model = "Luxul XAP-810 V1"; -+ -+ chosen { -+ bootargs = "earlycon"; -+ }; -+ -+ memory { -+ reg = <0x00000000 0x08000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ 5ghz { -+ label = "bcm53xx:blue:5ghz"; -+ gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "default-off"; -+ }; -+ -+ system { -+ label = "bcm53xx:green:system"; -+ gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "timer"; -+ }; -+ }; -+ -+ pcie0_leds { -+ compatible = "gpio-leds"; -+ -+ 2ghz { -+ label = "bcm53xx:blue:2ghz"; -+ gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "default-off"; -+ }; -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ restart { -+ label = "Reset"; -+ linux,code = ; -+ gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; -+ -+&pcie0 { -+ ranges = <0x00000000 0 0 0 0 0x00100000>; -+ #address-cells = <3>; -+ #size-cells = <2>; -+ -+ bridge@0,0,0 { -+ reg = <0x0000 0 0 0 0>; -+ ranges = <0x00000000 0 0 0 0 0 0 0x00100000>; -+ #address-cells = <3>; -+ #size-cells = <2>; -+ -+ wifi@0,1,0 { -+ reg = <0x0000 0 0 0 0>; -+ ranges = <0x00000000 0 0 0 0x00100000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ pcie0_chipcommon: chipcommon@0 { -+ reg = <0 0x1000>; -+ -+ gpio-controller; -+ #gpio-cells = <2>; -+ }; -+ }; -+ }; -+}; diff --git a/target/linux/bcm53xx/patches-4.14/035-v4.15-0005-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-1440.patch b/target/linux/bcm53xx/patches-4.14/035-v4.15-0005-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-1440.patch deleted file mode 100644 index 9d43dd58d0..0000000000 --- a/target/linux/bcm53xx/patches-4.14/035-v4.15-0005-ARM-dts-BCM53573-Add-DT-for-Luxul-XAP-1440.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7030ea600d560026b91726f2eb79c856b813afa9 Mon Sep 17 00:00:00 2001 -From: Dan Haab -Date: Mon, 9 Oct 2017 09:47:00 -0600 -Subject: [PATCH] ARM: dts: BCM53573: Add DT for Luxul XAP-1440 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is BCM53573 WiSoC based outdoor access point with an extra BCM43217 -chipset used for 2.4 GHz. - -Signed-off-by: Dan Haab -Acked-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 50 +++++++++++++++++++++++++++ - 2 files changed, 51 insertions(+) - create mode 100644 arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm953012hr.dtb \ - bcm953012k.dtb - dtb-$(CONFIG_ARCH_BCM_53573) += \ -+ bcm47189-luxul-xap-1440.dtb \ - bcm47189-luxul-xap-810.dtb \ - bcm47189-tenda-ac9.dtb \ - bcm947189acdbmr.dtb ---- /dev/null -+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts -@@ -0,0 +1,50 @@ -+/* -+ * Copyright 2017 Luxul Inc. -+ * -+ * Licensed under the ISC license. -+ */ -+ -+/dts-v1/; -+ -+#include "bcm53573.dtsi" -+ -+/ { -+ compatible = "luxul,xap-1440-v1", "brcm,bcm47189", "brcm,bcm53573"; -+ model = "Luxul XAP-1440 V1"; -+ -+ chosen { -+ bootargs = "earlycon"; -+ }; -+ -+ memory { -+ reg = <0x00000000 0x08000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ wlan { -+ label = "bcm53xx:blue:wlan"; -+ gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "default-off"; -+ }; -+ -+ system { -+ label = "bcm53xx:green:system"; -+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "timer"; -+ }; -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ restart { -+ label = "Reset"; -+ linux,code = ; -+ gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; diff --git a/target/linux/bcm53xx/patches-4.14/036-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch b/target/linux/bcm53xx/patches-4.14/036-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch deleted file mode 100644 index 043d38b832..0000000000 --- a/target/linux/bcm53xx/patches-4.14/036-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 811ae58e76da88106f6d28159d4ea7b163dfaa48 Mon Sep 17 00:00:00 2001 -From: INAGAKI Hiroshi -Date: Wed, 7 Mar 2018 20:33:56 +0900 -Subject: [PATCH] ARM: dts: BCM5301X: add missing LEDs for Buffalo WZR-900DHP -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Buffalo WZR-900DHP has 8 LEDs, but there is not LED definitions in the -dts and cannot configure these LEDs. -I Added missing LED definitions for WZR-900DHP. - -Signed-off-by: INAGAKI Hiroshi -Reviewed-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 68 +++++++++++++++++++++++ - 1 file changed, 68 insertions(+) - ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -@@ -35,6 +35,74 @@ - 0x88000000 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"; -+ -+ usb { -+ label = "bcm53xx:green:usb"; -+ gpios = <&hc595 0 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ 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>; -+ }; -+ -+ 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>; -+ }; -+ -+ 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>; -+ }; -+ -+ wireless1 { -+ label = "bcm53xx:amber:wireless"; -+ gpios = <&hc595 7 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ - gpio-keys { - compatible = "gpio-keys"; - #address-cells = <1>; diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch deleted file mode 100644 index e2fe0be909..0000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0c0d1c90ddc44df70401b7cfff178c41b2f83ffa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 4 Apr 2018 15:14:21 +0200 -Subject: [PATCH] ARM: dts: BCM5301X: Switch Luxul XWC-1000 to the new fixed - partitions syntax -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This new syntax is slightly better designed & uses "compatible" string. -For details see Documentation/devicetree/bindings/mtd/partition.txt . - -Signed-off-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - ---- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -@@ -26,9 +26,15 @@ - - nand: nand@18028000 { - nandcs@0 { -- partition@0 { -- label = "ubi"; -- reg = <0x00000000 0x08000000>; -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "ubi"; -+ reg = <0x00000000 0x08000000>; -+ }; - }; - }; - }; diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch deleted file mode 100644 index 6599520b92..0000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch +++ /dev/null @@ -1,440 +0,0 @@ -From 2b3db67ce4bc4d1d8556e87a17df7765da8dbdc5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 2 May 2018 16:11:02 +0200 -Subject: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ - / MIT -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These files were created and ever touched by a group of three people -only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC. - -Introducing and discussing SPDX-License-Identifier resulted in a -conclusion that ISC is a not recommended license (see also a -license-rules.rst). Moveover an old e-mail from Alan Cox was pointed -which explained that dual licensing is a safer solution than depending -on a common compatibility belief. - -This commit switches most of BCM5301X DTS files to dual licensing using: -1) GPL 2.0+ to make sure they are compatible with Linux kernel -2) MIT to allow sharing with more permissive projects -Both licenses belong to the preferred ones (see LICENSES/preferred/). - -An attempt to relicense remaining files will be made separately and will -require approve from more/other developers. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Greg Kroah-Hartman -Acked-by: Hauke Mehrtens -Acked-by: Dan Haab -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------ - arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------ - arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +-- - arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +-- - arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +-- - arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------ - arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +-- - arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------ - arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------ - arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +-- - arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +-- - arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +-- - arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +-- - arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------ - arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +-- - arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------ - arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +-- - arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +-- - arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +-- - arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +-- - arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +-- - arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +-- - arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +-- - arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +-- - arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +-- - 25 files changed, 25 insertions(+), 120 deletions(-) - ---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Asus RT-AC56U - * - * Copyright (C) 2015 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Asus RT-AC68U - * - * Copyright (C) 2015 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts -+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2017 Rafał Miłecki -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts -+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright 2016 Luxul Inc. -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -@@ -1,10 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * 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/; ---- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Netgear R6300 V2 - * - * Copyright (C) 2014 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -@@ -1,10 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X arm platform code. - * DTS for SmartRG SR400ac - * - * Copyright (C) 2015 Rafał Miłecki -- * -- * Licensed under the GNU/GPL. See COPYING for details. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Asus RT-N18U - * - * Copyright (C) 2014 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Buffalo WZR-600DHP2 - * - * Copyright (C) 2014 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts -+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright 2017 Luxul Inc. -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts -+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright 2017 Luxul Inc. -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2017 Rafał Miłecki -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts -+++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2017 Rafał Miłecki -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts -+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Netgear R7000 - * - * Copyright (C) 2015 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts -+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2016 Rafał Miłecki -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for D-Link DIR-885L - * - * Copyright (C) 2016 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts -+++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2017 Rafał Miłecki -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2017 Luxul Inc. -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2017 Luxul Inc. -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts -+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright 2016 Luxul Inc. -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts -+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright (C) 2016 Rafał Miłecki -- * -- * Licensed under the ISC license. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi -+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi -@@ -1,9 +1,8 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom Northstar NAND. - * - * Copyright (C) 2016 Rafał Miłecki -- * -- * Licensed under the ISC license. - */ - - #include "bcm5301x-nand-cs0.dtsi" ---- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi -+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi -@@ -1,7 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Copyright 2016 Luxul Inc. -- * -- * Licensed under the ISC license. - */ - - #include "bcm5301x-nand-cs0.dtsi" ---- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi -+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi -@@ -1,3 +1,4 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X Nand chip defaults. - * -@@ -5,8 +6,6 @@ - * and uses 8 bit ECC. - * - * Copyright (C) 2015 Hauke Mehrtens -- * -- * Licensed under the GNU/GPL. See COPYING for details. - */ - - #include "bcm5301x-nand-cs0.dtsi" ---- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi -+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi -@@ -1,9 +1,8 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom Northstar NAND. - * - * Copyright (C) 2015 Hauke Mehrtens -- * -- * Licensed under the GNU/GPL. See COPYING for details. - */ - - / { diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch deleted file mode 100644 index cc7ff8552a..0000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch +++ /dev/null @@ -1,79 +0,0 @@ -From fd0ab539d185a828f2071ee5f311bf101c7fea08 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Fri, 4 May 2018 11:54:45 +0200 -Subject: [PATCH] ARM: dts: BCM5301X: Relicense Buffalo 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 is clearly compatible with Linux kernel -2) MIT is also permissive but preferred over ISC - -These files were created and ever touched by a group of four people -only: Felix, INAGAKI, Hauke and me. - -Signed-off-by: Rafał Miłecki -Acked-by: Felix Fietkau -Acked-by: INAGAKI Hiroshi -Acked-by: Hauke Mehrtens -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 3 +-- - arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 13 +------------ - arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +-- - 3 files changed, 3 insertions(+), 16 deletions(-) - ---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -1,10 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Buffalo WZR-1750DHP - * - * Copyright (C) 2014 Rafał Miłecki -- * -- * Licensed under the GNU/GPL. See COPYING for details. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Buffalo WZR-900DHP - * - * Copyright (C) 2015 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; ---- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -1,10 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Buffalo WXR-1900DHP - * - * Copyright (C) 2015 Felix Fietkau -- * -- * Licensed under the GNU/GPL. See COPYING for details. - */ - - /dts-v1/; diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch deleted file mode 100644 index 4285a59a6d..0000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 2e2105a1578172eaf61e3b59a2c10c4fe04c21b9 Mon Sep 17 00:00:00 2001 -From: Dan Haab -Date: Fri, 4 May 2018 10:08:43 -0600 -Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XWR-3150 V1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Luxul XWR-3150 is a wireless router similar to the XWR-3100 except: -1) It has more RAM -2) Its NAND controller in running in BCH8 mode -3) LAN ports LEDs are hardware controlled - -Signed-off-by: Dan Haab -Acked-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 77 ++++++++++++++++++++++++ - 2 files changed, 78 insertions(+) - create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -104,6 +104,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm47094-luxul-abr-4500.dtb \ - bcm47094-luxul-xbr-4500.dtb \ - bcm47094-luxul-xwr-3100.dtb \ -+ bcm47094-luxul-xwr-3150-v1.dtb \ - bcm47094-netgear-r8500.dtb \ - bcm94708.dtb \ - bcm94709.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts -@@ -0,0 +1,77 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+/* -+ * Copyright 2018 Luxul Inc. -+ */ -+ -+/dts-v1/; -+ -+#include "bcm47094.dtsi" -+#include "bcm5301x-nand-cs0-bch8.dtsi" -+ -+/ { -+ compatible = "luxul,xwr-3150-v1", "brcm,bcm47094", "brcm,bcm4708"; -+ model = "Luxul XWR-3150 V1"; -+ -+ chosen { -+ bootargs = "earlycon"; -+ }; -+ -+ memory { -+ reg = <0x00000000 0x08000000 -+ 0x88000000 0x18000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ power { -+ label = "bcm53xx:green:power"; -+ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "default-on"; -+ }; -+ -+ usb3 { -+ label = "bcm53xx:green:usb3"; -+ gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>; -+ trigger-sources = <&ohci_port1>, <&ehci_port1>, -+ <&xhci_port1>; -+ linux,default-trigger = "usbport"; -+ }; -+ -+ status { -+ label = "bcm53xx:green:status"; -+ gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "timer"; -+ }; -+ -+ 2ghz { -+ label = "bcm53xx:green:2ghz"; -+ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5ghz { -+ label = "bcm53xx:green:5ghz"; -+ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ restart { -+ label = "Reset"; -+ linux,code = ; -+ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; -+ -+&usb3 { -+ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; -+}; -+ -+&spi_nor { -+ status = "okay"; -+}; diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch deleted file mode 100644 index a6102857c3..0000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 6054cb5788072e214af582c42d9bd8c5ffa6e288 Mon Sep 17 00:00:00 2001 -From: Dan Haab -Date: Fri, 4 May 2018 10:08:44 -0600 -Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XAP-1610 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It's an access point based on BCM47094 SoC with two BCM4366E wireless -chipsets. - -Signed-off-by: Dan Haab -Acked-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 57 +++++++++++++++++++++++++++ - 2 files changed, 58 insertions(+) - create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -102,6 +102,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm47094-dlink-dir-885l.dtb \ - bcm47094-linksys-panamera.dtb \ - bcm47094-luxul-abr-4500.dtb \ -+ bcm47094-luxul-xap-1610.dtb \ - bcm47094-luxul-xbr-4500.dtb \ - bcm47094-luxul-xwr-3100.dtb \ - bcm47094-luxul-xwr-3150-v1.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts -@@ -0,0 +1,57 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+/* -+ * Copyright 2018 Luxul Inc. -+ */ -+ -+/dts-v1/; -+ -+#include "bcm47094.dtsi" -+ -+/ { -+ compatible = "luxul,xap-1610-v1", "brcm,bcm47094", "brcm,bcm4708"; -+ model = "Luxul XAP-1610 V1"; -+ -+ chosen { -+ bootargs = "earlycon"; -+ }; -+ -+ memory { -+ reg = <0x00000000 0x08000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ status { -+ label = "bcm53xx:green:status"; -+ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "timer"; -+ }; -+ -+ 2ghz { -+ label = "bcm53xx:blue:2ghz"; -+ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5ghz { -+ label = "bcm53xx:blue:5ghz"; -+ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ restart { -+ label = "Reset"; -+ linux,code = ; -+ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; -+ -+&spi_nor { -+ status = "okay"; -+}; diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch deleted file mode 100644 index f774bc6b82..0000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9c281b5e129961b9940a27f8da24dddd1c0eba87 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Fri, 4 May 2018 12:03:24 +0200 -Subject: [PATCH] ARM: dts: BCM5301X: Relicense Asus RT-AC87U 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 is clearly compatible with Linux kernel -2) MIT is also permissive but preferred over ISC - -This file were created and ever touched by a group of three people only: -Álvaro, Hauke and me. - -Signed-off-by: Rafał Miłecki -Acked-by: Hauke Mehrtens -Acked-by: Álvaro Fernández Rojas -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - ---- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts -+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts -@@ -1,20 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - /* - * Broadcom BCM470X / BCM5301X ARM platform code. - * DTS for Asus RT-AC87U - * - * Copyright (C) 2015 Rafał Miłecki -- * -- * 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. - */ - - /dts-v1/; diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch deleted file mode 100644 index e397ddd0b2..0000000000 --- a/target/linux/bcm53xx/patches-4.14/037-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a05f1e36a57d02374a203719abc5bf2e8c51e125 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 10 May 2018 23:20:00 +0200 -Subject: [PATCH] ARM: dts: BCM5301X: Switch D-Link DIR-885L to the new - partitions syntax -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This new syntax is slightly better designed & uses "compatible" string. -For details see Documentation/devicetree/bindings/mtd/partition.txt . - -Signed-off-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - ---- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -@@ -26,9 +26,15 @@ - - nand: nand@18028000 { - nandcs@0 { -- partition@0 { -- label = "firmware"; -- reg = <0x00000000 0x08000000>; -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "firmware"; -+ reg = <0x00000000 0x08000000>; -+ }; - }; - }; - }; diff --git a/target/linux/bcm53xx/patches-4.14/038-v4.19-0001-ARM-dts-BCM5301X-Make-USB-3.0-PHY-use-MDIO-PHY-drive.patch b/target/linux/bcm53xx/patches-4.14/038-v4.19-0001-ARM-dts-BCM5301X-Make-USB-3.0-PHY-use-MDIO-PHY-drive.patch deleted file mode 100644 index 226109c09c..0000000000 --- a/target/linux/bcm53xx/patches-4.14/038-v4.19-0001-ARM-dts-BCM5301X-Make-USB-3.0-PHY-use-MDIO-PHY-drive.patch +++ /dev/null @@ -1,456 +0,0 @@ -From 37f6130ec39fe14e923d472746a51e6f06f761b7 Mon Sep 17 00:00:00 2001 -From: Vivek Unune -Date: Mon, 9 Apr 2018 18:31:53 -0400 -Subject: [PATCH] ARM: dts: BCM5301X: Make USB 3.0 PHY use MDIO PHY driver -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Currently, the USB 3.0 PHY in bcm5301x.dtsi uses platform driver which -requires register range "ccb-mii" <0x18003000 0x1000>. This range -overlaps with MDIO cmd and param registers (<0x18003000 0x8>). -Essentially, the platform driver partly acts like a MDIO bus driver, -hence to use of this register range. - -In some Northstar devices like Linksys EA9500, secondary switch is -connected via external MDIO. The only way to access and configure the -external switch is via MDIO bus. When we enable the MDIO bus in it's -current state, the MDIO bus and any child buses fail to register because -of the register range overlap. - -On Northstar, the USB 3.0 PHY is connected at address 0x10 on the -internal MDIO bus. This change moves the usb3_phy node and makes it a -child node of internal MDIO bus. - -Thanks to Rafał Miłecki's commit af850e14a7ae ("phy: bcm-ns-usb3: add -MDIO driver using proper bus layer") the same USB 3.0 platform driver -can now act as USB 3.0 PHY MDIO driver. - -Tested on Linksys Panamera (EA9500) - -Signed-off-by: Vivek Unune -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 4 +++ - arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 4 +++ - arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +++ - arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 4 +++ - arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 +++ - arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +++ - arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 +++ - arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 +++ - arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 +++ - arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 +++ - arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +++ - arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 +++ - arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 4 +++ - arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 4 +++ - arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 +++ - arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 4 +++ - arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 4 +++ - arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 4 +++ - arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 4 +++ - arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 4 +++ - arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 +++ - arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +++ - arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 4 +++ - arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 +++ - arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 +++ - arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 4 +++ - arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 4 +++ - arch/arm/boot/dts/bcm47094.dtsi | 7 +++-- - arch/arm/boot/dts/bcm5301x.dtsi | 35 +++++++++++++++++----- - arch/arm/boot/dts/bcm94708.dts | 4 +++ - arch/arm/boot/dts/bcm94709.dts | 4 +++ - arch/arm/boot/dts/bcm953012er.dts | 4 +++ - arch/arm/boot/dts/bcm953012hr.dts | 4 +++ - arch/arm/boot/dts/bcm953012k.dts | 4 +++ - 34 files changed, 159 insertions(+), 11 deletions(-) - ---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -@@ -90,3 +90,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -@@ -80,3 +80,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -146,3 +146,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts -+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts -@@ -38,3 +38,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts -+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts -@@ -57,3 +57,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -@@ -64,3 +64,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -91,3 +91,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -@@ -83,3 +83,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -@@ -158,3 +158,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -@@ -74,3 +74,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -@@ -118,3 +118,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -@@ -104,3 +104,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts -+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts -@@ -57,3 +57,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts -+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts -@@ -105,3 +105,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -@@ -99,3 +99,7 @@ - &usb2 { - vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts -+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts -@@ -62,3 +62,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -@@ -127,3 +127,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts -+++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts -@@ -39,3 +39,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts -+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts -@@ -101,3 +101,7 @@ - &usb3 { - vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts -+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts -@@ -182,3 +182,7 @@ - &usb3 { - vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts -+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts -@@ -104,3 +104,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -@@ -115,3 +115,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts -+++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts -@@ -33,3 +33,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -@@ -60,3 +60,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -@@ -60,3 +60,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts -+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts -@@ -100,3 +100,7 @@ - &spi_nor { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts -+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts -@@ -91,3 +91,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm47094.dtsi -+++ b/arch/arm/boot/dts/bcm47094.dtsi -@@ -7,9 +7,10 @@ - #include "bcm4708.dtsi" - - / { -- usb3_phy: usb3-phy { -- compatible = "brcm,ns-bx-usb3-phy"; -- }; -+}; -+ -+&usb3_phy { -+ compatible = "brcm,ns-bx-usb3-phy"; - }; - - &uart0 { ---- a/arch/arm/boot/dts/bcm5301x.dtsi -+++ b/arch/arm/boot/dts/bcm5301x.dtsi -@@ -154,13 +154,6 @@ - clock-names = "phy-ref-clk"; - }; - -- usb3_phy: usb3-phy { -- compatible = "brcm,ns-ax-usb3-phy"; -- reg = <0x18105000 0x1000>, <0x18003000 0x1000>; -- reg-names = "dmp", "ccb-mii"; -- #phy-cells = <0>; -- }; -- - axi@18000000 { - compatible = "brcm,bus-axi"; - reg = <0x18000000 0x1000>; -@@ -359,7 +352,33 @@ - reg = <0x18003000 0x8>; - #size-cells = <1>; - #address-cells = <0>; -- status = "disabled"; -+ }; -+ -+ mdio-bus-mux { -+ compatible = "mdio-mux-mmioreg"; -+ mdio-parent-bus = <&mdio>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0x18003000 0x4>; -+ mux-mask = <0x200>; -+ -+ mdio@0 { -+ reg = <0x0>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ usb3_phy: usb3-phy@10 { -+ compatible = "brcm,ns-ax-usb3-phy"; -+ reg = <0x10>; -+ usb3-dmp-syscon = <&usb3_dmp>; -+ #phy-cells = <0>; -+ status = "disabled"; -+ }; -+ }; -+ }; -+ -+ usb3_dmp: syscon@18105000 { -+ reg = <0x18105000 0x1000>; - }; - - i2c0: i2c@18009000 { ---- a/arch/arm/boot/dts/bcm94708.dts -+++ b/arch/arm/boot/dts/bcm94708.dts -@@ -42,3 +42,7 @@ - reg = <0x00000000 0x08000000>; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm94709.dts -+++ b/arch/arm/boot/dts/bcm94709.dts -@@ -42,3 +42,7 @@ - reg = <0x00000000 0x08000000>; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm953012er.dts -+++ b/arch/arm/boot/dts/bcm953012er.dts -@@ -90,3 +90,7 @@ - }; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm953012hr.dts -+++ b/arch/arm/boot/dts/bcm953012hr.dts -@@ -95,3 +95,7 @@ - reg = <0x00700000 0x00900000>; - }; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; ---- a/arch/arm/boot/dts/bcm953012k.dts -+++ b/arch/arm/boot/dts/bcm953012k.dts -@@ -113,3 +113,7 @@ - &uart1 { - status = "okay"; - }; -+ -+&usb3_phy { -+ status = "okay"; -+}; diff --git a/target/linux/bcm53xx/patches-4.14/038-v4.19-0002-ARM-dts-BCM53573-Add-architected-timer.patch b/target/linux/bcm53xx/patches-4.14/038-v4.19-0002-ARM-dts-BCM53573-Add-architected-timer.patch deleted file mode 100644 index f1b301ca27..0000000000 --- a/target/linux/bcm53xx/patches-4.14/038-v4.19-0002-ARM-dts-BCM53573-Add-architected-timer.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a21e7548438f3a8f59f9b9f3a8bc973613d3726a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 14 Jun 2018 18:41:47 +0200 -Subject: [PATCH] ARM: dts: BCM53573: Add architected timer -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It's a standard ARM architected timer that was simply missed when -initially adding this .dtsi file. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm53573.dtsi | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/arch/arm/boot/dts/bcm53573.dtsi -+++ b/arch/arm/boot/dts/bcm53573.dtsi -@@ -48,6 +48,14 @@ - }; - }; - -+ timer { -+ compatible = "arm,armv7-timer"; -+ interrupts = , -+ , -+ , -+ ; -+ }; -+ - clocks { - #address-cells = <1>; - #size-cells = <1>; diff --git a/target/linux/bcm53xx/patches-4.14/038-v4.19-0003-ARM-dts-BCM5301X-Add-support-for-Linksys-EA9500.patch b/target/linux/bcm53xx/patches-4.14/038-v4.19-0003-ARM-dts-BCM5301X-Add-support-for-Linksys-EA9500.patch deleted file mode 100644 index 701605a973..0000000000 --- a/target/linux/bcm53xx/patches-4.14/038-v4.19-0003-ARM-dts-BCM5301X-Add-support-for-Linksys-EA9500.patch +++ /dev/null @@ -1,269 +0,0 @@ -From 2bebdfcdcd0feb58d5df419532a2cedc78a336d7 Mon Sep 17 00:00:00 2001 -From: Vivek Unune -Date: Mon, 18 Jun 2018 13:41:59 -0400 -Subject: [PATCH] ARM: dts: BCM5301X: Add support for Linksys EA9500 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Hardware Info -------------- - -Processor - Broadcom BCM4709C0KFEBG dual-core @ 1.4 GHz -Switch - BCM53012 in BCM4709C0KFEBG & external BCM53125 -DDR3 RAM - 256 MB -Flash - 128 MB (Toshiba TC58BVG0S3HTA00) -2.4GHz - BCM4366 4×4 2.4/5G single chip 802.11ac SoC -Power Amp - Skyworks SE2623L 2.4 GHz power amp (x4) -5GHz x 2 - BCM4366 4×4 2.4/5G single chip 802.11ac SoC -Power Amp - PLX Technology PEX8603 3-lane, 3-port PCIe switch -Ports - 8 Ports, 1 WAN Ports -Antennas - 8 Antennas -Serial Port - @J6 [GND,TX,RX] (VCC NC) 115200 8n1 - -Tested with OpenWrt built with DSA driver and Kernel v4.14 - -Signed-off-by: Vivek Unune -Signed-off-by: Florian Fainelli ---- - arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 229 ++++++++++++++++++++++++ - 1 file changed, 229 insertions(+) - ---- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts -+++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts -@@ -31,6 +31,235 @@ - linux,code = ; - gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>; - }; -+ -+ rfkill { -+ label = "WiFi"; -+ linux,code = ; -+ gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>; -+ }; -+ -+ reset { -+ label = "Reset"; -+ linux,code = ; -+ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ wps { -+ label = "bcm53xx:white:wps"; -+ gpios = <&chipcommon 22 GPIO_ACTIVE_LOW>; -+ }; -+ -+ usb2 { -+ label = "bcm53xx:green:usb2"; -+ gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>; -+ trigger-sources = <&ohci_port2>, <&ehci_port2>; -+ linux,default-trigger = "usbport"; -+ }; -+ -+ usb3 { -+ label = "bcm53xx:green:usb3"; -+ gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>; -+ trigger-sources = <&ohci_port1>, <&ehci_port1>, -+ <&xhci_port1>; -+ linux,default-trigger = "usbport"; -+ }; -+ -+ power { -+ label = "bcm53xx:white:power"; -+ gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ wifi-disabled { -+ label = "bcm53xx:amber:wifi-disabled"; -+ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wifi-enabled { -+ label = "bcm53xx:white:wifi-enabled"; -+ gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ bluebar1 { -+ label = "bcm53xx:white:bluebar1"; -+ gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ bluebar2 { -+ label = "bcm53xx:white:bluebar2"; -+ gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ bluebar3 { -+ label = "bcm53xx:white:bluebar3"; -+ gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>; -+ }; -+ -+ bluebar4 { -+ label = "bcm53xx:white:bluebar4"; -+ gpios = <&chipcommon 18 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ bluebar5 { -+ label = "bcm53xx:white:bluebar5"; -+ gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ bluebar6 { -+ label = "bcm53xx:white:bluebar6"; -+ gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ bluebar7 { -+ label = "bcm53xx:white:bluebar7"; -+ gpios = <&chipcommon 21 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ bluebar8 { -+ label = "bcm53xx:white:bluebar8"; -+ gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+ mdio-bus-mux { -+ /* BIT(9) = 1 => external mdio */ -+ mdio_ext: mdio@200 { -+ reg = <0x200>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; -+ }; -+ -+ mdio-mii-mux { -+ compatible = "mdio-mux-mmioreg"; -+ mdio-parent-bus = <&mdio_ext>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0x1800c1c0 0x4>; -+ -+ /* BIT(6) = mdc, BIT(7) = mdio */ -+ mux-mask = <0xc0>; -+ -+ mdio-mii@0 { -+ /* Enable MII function */ -+ reg = <0x0>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ switch@0 { -+ compatible = "brcm,bcm53125"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reset-gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; -+ reset-names = "robo_reset"; -+ reg = <0>; -+ dsa,member = <1 0>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ label = "lan1"; -+ }; -+ -+ port@1 { -+ reg = <1>; -+ label = "lan5"; -+ }; -+ -+ port@2 { -+ reg = <2>; -+ label = "lan2"; -+ }; -+ -+ port@3 { -+ reg = <3>; -+ label = "lan6"; -+ }; -+ -+ port@4 { -+ reg = <4>; -+ label = "lan3"; -+ }; -+ -+ sw1_p8: port@8 { -+ reg = <8>; -+ ethernet = <&sw0_p0>; -+ label = "cpu"; -+ -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ }; -+ }; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&usb2 { -+ vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>; -+}; -+ -+&usb3 { -+ vcc-gpio = <&chipcommon 14 GPIO_ACTIVE_HIGH>; -+}; -+ -+&srab { -+ compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab"; -+ status = "okay"; -+ dsa,member = <0 0>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@1 { -+ reg = <1>; -+ label = "lan7"; -+ }; -+ -+ port@2 { -+ reg = <2>; -+ label = "lan4"; -+ }; -+ -+ port@3 { -+ reg = <3>; -+ label = "lan8"; -+ }; -+ -+ port@4 { -+ reg = <4>; -+ label = "wan"; -+ }; -+ -+ port@8 { -+ reg = <8>; -+ ethernet = <&gmac2>; -+ label = "cpu"; -+ -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ }; -+ }; -+ -+ sw0_p0: port@0 { -+ reg = <0>; -+ label = "extsw"; -+ -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ }; -+ }; - }; - }; -