--- /dev/null
+From b7f264fa496eb2a6dd1d67dc91dbe8ffcb142487 Mon Sep 17 00:00:00 2001
+From: Dan Haab <riproute@gmail.com>
+Date: Sun, 2 Dec 2018 17:00:15 -0700
+Subject: [PATCH] ARM: dts: BCM53573: Relicense Luxul 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 BCM53573 files and BCM5301X.
+
+Signed-off-by: Dan Haab <dan.haab@luxul.com>
+Acked-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 3 +--
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.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/bcm47189-luxul-xap-810.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.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/;
--- /dev/null
+From 40a17923367118e32e5e413a952736dd83635b32 Mon Sep 17 00:00:00 2001
+From: Hao Dong <halbertdong@gmail.com>
+Date: Sun, 20 Jan 2019 23:33:27 +0100
+Subject: [PATCH] ARM: dts: BCM5301X: Add basic DT for Phicomm K3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This router has BCM4709C0 SoC, 128 MiB NAND flash (MX30LF1G18AC-TI),
+512 MiB memory and 3 x LAN and 1 x WAN ports. WiFi chips are
+BCM4366C0 x 2. The router has a small LCD and 3 capactive keys driven by
+a PIC microcontroller, which is in turn wired to UART1 of main board.
+
+Signed-off-by: Hao Dong <halbertdong@gmail.com>
+[rmilecki: drop chosen { }, fix whitespaces, update commit message]
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 71 +++++++++++++++++++++++
+ 2 files changed, 72 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -108,6 +108,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ bcm47094-luxul-xwr-3100.dtb \
+ bcm47094-luxul-xwr-3150-v1.dtb \
+ bcm47094-netgear-r8500.dtb \
++ bcm47094-phicomm-k3.dtb \
+ bcm94708.dtb \
+ bcm94709.dtb \
+ bcm953012er.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+@@ -0,0 +1,71 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Copyright (C) 2017 Hamster Tian <haotia@gmail.com>
++ * Copyright (C) 2019 Hao Dong <halbertdong@gmail.com>
++ */
++
++/dts-v1/;
++
++#include "bcm47094.dtsi"
++#include "bcm5301x-nand-cs0-bch4.dtsi"
++
++/ {
++ compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
++ model = "Phicomm K3";
++
++ memory {
++ reg = <0x00000000 0x08000000
++ 0x88000000 0x18000000>;
++ };
++
++ gpio-keys {
++ compatible = "gpio-keys";
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ restart {
++ label = "Reset";
++ linux,code = <KEY_RESTART>;
++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
++ };
++ };
++};
++
++&uart1 {
++ status = "okay";
++};
++
++&usb3_phy {
++ status = "okay";
++};
++
++&nandcs {
++ partitions {
++ compatible = "fixed-partitions";
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ partition@0 {
++ label = "boot";
++ reg = <0x0000000 0x0080000>;
++ read-only;
++ };
++
++ partition@80000 {
++ label = "nvram";
++ reg = <0x0080000 0x0100000>;
++ };
++
++ partition@180000{
++ label = "phicomm";
++ reg = <0x0180000 0x0280000>;
++ read-only;
++ };
++
++ partition@400000 {
++ label = "firmware";
++ reg = <0x0400000 0x7C00000>;
++ compatible = "brcm,trx";
++ };
++ };
++};
memory {
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
model = "Luxul XAP-1440 V1";
chosen {
memory {
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
model = "Luxul XAP-810 V1";
chosen {
};
memory {
+--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
++++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+@@ -13,6 +13,10 @@
+ compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
+ model = "Phicomm K3";
+
++ chosen {
++ bootargs = "console=ttyS0,115200";
++ };
++
+ memory {
+ reg = <0x00000000 0x08000000
+ 0x88000000 0x18000000>;
+++ /dev/null
-From 8ab0ea8e9275c03f253f84dc83ee86cdbeb1fcf4 Mon Sep 17 00:00:00 2001
-From: Hao Dong <halbertdong@gmail.com>
-Date: Sat, 19 Jan 2019 17:25:29 +0000
-Subject: [PATCH] ARM: dts: BCM5301X: Add basic DT for Phicomm K3
-
-This router has BCM4709C0, 128MB NAND flash (MX30LF1G18AC-TI),
-and 512MB memory, with 3 x LAN and 1 x WAN. WL chips are
-BCM4366C0 x 2. The router has a small LCD and 3 capactive keys
-driven by a PIC microcontroller, which is in turn wired to
-UART1 of main board.
-
-Everything except the LCD works. Hamster has activated LCD through
-UART1, but further programming, i.e., a independent package, is
-required to make sure its working properly.
-
-Since the firmware of Broadcom 4366c0 has been provided by
-openwrt.org, now its wireless is functional but limited. The
-"official" firmware cannot work properly in some 5G Hz channel.
-
-Signed-off-by: Hao Dong <halbertdong@gmail.com>
----
- arch/arm/boot/dts/Makefile | 1 +
- arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 75 +++++++++++++++++++++++
- 2 files changed, 76 insertions(+)
- create mode 100644 arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -109,6 +109,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
- bcm47094-luxul-xwr-3100.dtb \
- bcm47094-luxul-xwr-3150-v1.dtb \
- bcm47094-netgear-r8500.dtb \
-+ bcm47094-phicomm-k3.dtb \
- bcm94708.dtb \
- bcm94709.dtb \
- bcm953012er.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-@@ -0,0 +1,75 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+/*
-+* Copyright (C) 2017 Hamster Tian <haotia@gmail.com>
-+* Copyright (C) 2019 Hao Dong <halbertdong@gmail.com>
-+*/
-+
-+/dts-v1/;
-+
-+#include "bcm47094.dtsi"
-+#include "bcm5301x-nand-cs0-bch4.dtsi"
-+
-+/ {
-+ compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
-+ model = "Phicomm K3";
-+
-+ chosen {
-+ bootargs = "console=ttyS0,115200";
-+ };
-+
-+ memory {
-+ reg = <0x00000000 0x08000000
-+ 0x88000000 0x18000000>;
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ restart {
-+ label = "Reset";
-+ linux,code = <KEY_RESTART>;
-+ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
-+ };
-+ };
-+};
-+
-+&uart1 {
-+ status = "okay";
-+};
-+
-+&usb3_phy {
-+ status = "okay";
-+};
-+
-+&nandcs {
-+ partitions {
-+ compatible = "fixed-partitions";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+
-+ partition@0 {
-+ label = "boot";
-+ reg = <0x0000000 0x0080000>;
-+ read-only;
-+ };
-+
-+ partition@80000 {
-+ label = "nvram";
-+ reg = <0x0080000 0x0100000>;
-+ };
-+
-+ partition@180000{
-+ label = "phicomm";
-+ reg = <0x0180000 0x0280000>;
-+ read-only;
-+ };
-+
-+ partition@400000 {
-+ label = "firmware";
-+ reg = <0x0400000 0x7C00000>;
-+ compatible = "brcm,trx";
-+ };
-+ };
-+};
--- /dev/null
+From b7f264fa496eb2a6dd1d67dc91dbe8ffcb142487 Mon Sep 17 00:00:00 2001
+From: Dan Haab <riproute@gmail.com>
+Date: Sun, 2 Dec 2018 17:00:15 -0700
+Subject: [PATCH] ARM: dts: BCM53573: Relicense Luxul 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 BCM53573 files and BCM5301X.
+
+Signed-off-by: Dan Haab <dan.haab@luxul.com>
+Acked-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 3 +--
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.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/bcm47189-luxul-xap-810.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.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/;
--- /dev/null
+From 40a17923367118e32e5e413a952736dd83635b32 Mon Sep 17 00:00:00 2001
+From: Hao Dong <halbertdong@gmail.com>
+Date: Sun, 20 Jan 2019 23:33:27 +0100
+Subject: [PATCH] ARM: dts: BCM5301X: Add basic DT for Phicomm K3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This router has BCM4709C0 SoC, 128 MiB NAND flash (MX30LF1G18AC-TI),
+512 MiB memory and 3 x LAN and 1 x WAN ports. WiFi chips are
+BCM4366C0 x 2. The router has a small LCD and 3 capactive keys driven by
+a PIC microcontroller, which is in turn wired to UART1 of main board.
+
+Signed-off-by: Hao Dong <halbertdong@gmail.com>
+[rmilecki: drop chosen { }, fix whitespaces, update commit message]
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 71 +++++++++++++++++++++++
+ 2 files changed, 72 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -114,6 +114,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ bcm47094-luxul-xwr-3100.dtb \
+ bcm47094-luxul-xwr-3150-v1.dtb \
+ bcm47094-netgear-r8500.dtb \
++ bcm47094-phicomm-k3.dtb \
+ bcm94708.dtb \
+ bcm94709.dtb \
+ bcm953012er.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+@@ -0,0 +1,71 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Copyright (C) 2017 Hamster Tian <haotia@gmail.com>
++ * Copyright (C) 2019 Hao Dong <halbertdong@gmail.com>
++ */
++
++/dts-v1/;
++
++#include "bcm47094.dtsi"
++#include "bcm5301x-nand-cs0-bch4.dtsi"
++
++/ {
++ compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
++ model = "Phicomm K3";
++
++ memory {
++ reg = <0x00000000 0x08000000
++ 0x88000000 0x18000000>;
++ };
++
++ gpio-keys {
++ compatible = "gpio-keys";
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ restart {
++ label = "Reset";
++ linux,code = <KEY_RESTART>;
++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
++ };
++ };
++};
++
++&uart1 {
++ status = "okay";
++};
++
++&usb3_phy {
++ status = "okay";
++};
++
++&nandcs {
++ partitions {
++ compatible = "fixed-partitions";
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ partition@0 {
++ label = "boot";
++ reg = <0x0000000 0x0080000>;
++ read-only;
++ };
++
++ partition@80000 {
++ label = "nvram";
++ reg = <0x0080000 0x0100000>;
++ };
++
++ partition@180000{
++ label = "phicomm";
++ reg = <0x0180000 0x0280000>;
++ read-only;
++ };
++
++ partition@400000 {
++ label = "firmware";
++ reg = <0x0400000 0x7C00000>;
++ compatible = "brcm,trx";
++ };
++ };
++};
memory {
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
model = "Luxul XAP-1440 V1";
chosen {
memory {
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
model = "Luxul XAP-810 V1";
chosen {
};
memory {
+--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
++++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+@@ -13,6 +13,10 @@
+ compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
+ model = "Phicomm K3";
+
++ chosen {
++ bootargs = "console=ttyS0,115200";
++ };
++
+ memory {
+ reg = <0x00000000 0x08000000
+ 0x88000000 0x18000000>;
+++ /dev/null
-From 8ab0ea8e9275c03f253f84dc83ee86cdbeb1fcf4 Mon Sep 17 00:00:00 2001
-From: Hao Dong <halbertdong@gmail.com>
-Date: Sat, 19 Jan 2019 17:25:29 +0000
-Subject: [PATCH] ARM: dts: BCM5301X: Add basic DT for Phicomm K3
-
-This router has BCM4709C0, 128MB NAND flash (MX30LF1G18AC-TI),
-and 512MB memory, with 3 x LAN and 1 x WAN. WL chips are
-BCM4366C0 x 2. The router has a small LCD and 3 capactive keys
-driven by a PIC microcontroller, which is in turn wired to
-UART1 of main board.
-
-Everything except the LCD works. Hamster has activated LCD through
-UART1, but further programming, i.e., a independent package, is
-required to make sure its working properly.
-
-Since the firmware of Broadcom 4366c0 has been provided by
-openwrt.org, now its wireless is functional but limited. The
-"official" firmware cannot work properly in some 5G Hz channel.
-
-Signed-off-by: Hao Dong <halbertdong@gmail.com>
----
- arch/arm/boot/dts/Makefile | 1 +
- arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 75 +++++++++++++++++++++++
- 2 files changed, 76 insertions(+)
- create mode 100644 arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -115,6 +115,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
- bcm47094-luxul-xwr-3100.dtb \
- bcm47094-luxul-xwr-3150-v1.dtb \
- bcm47094-netgear-r8500.dtb \
-+ bcm47094-phicomm-k3.dtb \
- bcm94708.dtb \
- bcm94709.dtb \
- bcm953012er.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-@@ -0,0 +1,75 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+/*
-+* Copyright (C) 2017 Hamster Tian <haotia@gmail.com>
-+* Copyright (C) 2019 Hao Dong <halbertdong@gmail.com>
-+*/
-+
-+/dts-v1/;
-+
-+#include "bcm47094.dtsi"
-+#include "bcm5301x-nand-cs0-bch4.dtsi"
-+
-+/ {
-+ compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708";
-+ model = "Phicomm K3";
-+
-+ chosen {
-+ bootargs = "console=ttyS0,115200";
-+ };
-+
-+ memory {
-+ reg = <0x00000000 0x08000000
-+ 0x88000000 0x18000000>;
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ restart {
-+ label = "Reset";
-+ linux,code = <KEY_RESTART>;
-+ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
-+ };
-+ };
-+};
-+
-+&uart1 {
-+ status = "okay";
-+};
-+
-+&usb3_phy {
-+ status = "okay";
-+};
-+
-+&nandcs {
-+ partitions {
-+ compatible = "fixed-partitions";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+
-+ partition@0 {
-+ label = "boot";
-+ reg = <0x0000000 0x0080000>;
-+ read-only;
-+ };
-+
-+ partition@80000 {
-+ label = "nvram";
-+ reg = <0x0080000 0x0100000>;
-+ };
-+
-+ partition@180000{
-+ label = "phicomm";
-+ reg = <0x0180000 0x0280000>;
-+ read-only;
-+ };
-+
-+ partition@400000 {
-+ label = "firmware";
-+ reg = <0x0400000 0x7C00000>;
-+ compatible = "brcm,trx";
-+ };
-+ };
-+};
projects / openwrt / staging / ynezz.git / commitdiff