[openwrt/openwrt] bcm4908: use DTS patches sent upstream
LEDE Commits
lede-commits at lists.infradead.org
Mon Feb 15 16:19:03 EST 2021
rmilecki pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/da92e9825ab043c299428b8aea7891d964787a12
commit da92e9825ab043c299428b8aea7891d964787a12
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Mon Feb 15 21:51:37 2021 +0100
bcm4908: use DTS patches sent upstream
There are 2 new patches:
1. Netgear R8000P switch ports
2. Netgear R8000P LEDs
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
...64-dts-broadcom-bcm4908-describe-USB-PHY.patch} | 10 +--
...oadcom-bcm4908-describe-Ethernet-control.patch} | 6 +-
...roadcom-bcm4908-describe-Netgear-R8000P-s.patch | 48 +++++++++++++
...roadcom-bcm4908-add-remaining-Netgear-R80.patch | 78 ++++++++++++++++++++++
...oadcom-bcm4908-describe-firmware-partiti.patch} | 36 +++-------
5 files changed, 145 insertions(+), 33 deletions(-)
diff --git a/target/linux/bcm4908/patches-5.4/300-arm64-dts-broadcom-bcm4908-describe-USB-PHY.patch b/target/linux/bcm4908/patches-5.4/130-0001-arm64-dts-broadcom-bcm4908-describe-USB-PHY.patch
similarity index 92%
rename from target/linux/bcm4908/patches-5.4/300-arm64-dts-broadcom-bcm4908-describe-USB-PHY.patch
rename to target/linux/bcm4908/patches-5.4/130-0001-arm64-dts-broadcom-bcm4908-describe-USB-PHY.patch
index b0b8cc5748..8a10212d92 100644
--- a/target/linux/bcm4908/patches-5.4/300-arm64-dts-broadcom-bcm4908-describe-USB-PHY.patch
+++ b/target/linux/bcm4908/patches-5.4/130-0001-arm64-dts-broadcom-bcm4908-describe-USB-PHY.patch
@@ -1,6 +1,5 @@
-From 28d11220a92e9fc4d7d1b8e52dc1c48980e336a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
-Date: Wed, 20 Jan 2021 20:34:00 +0100
+Date: Mon, 15 Feb 2021 19:46:54 +0100
Subject: [PATCH] arm64: dts: broadcom: bcm4908: describe USB PHY
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -12,9 +11,9 @@ and XHCI. It requires powering up using the PMB.
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
.../bcm4908/bcm4906-netgear-r8000p.dts | 17 +++++++++++++
- .../bcm4908/bcm4908-asus-gt-ac5300.dts | 16 ++++++++++++
+ .../bcm4908/bcm4908-asus-gt-ac5300.dts | 17 +++++++++++++
.../boot/dts/broadcom/bcm4908/bcm4908.dtsi | 25 ++++++++++++++++---
- 3 files changed, 54 insertions(+), 4 deletions(-)
+ 3 files changed, 55 insertions(+), 4 deletions(-)
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
@@ -44,11 +43,12 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
nand-ecc-step-size = <512>;
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
-@@ -44,6 +44,22 @@
+@@ -44,6 +44,23 @@
};
};
+&usb_phy {
++ brcm,ioc = <1>;
+ status = "okay";
+};
+
diff --git a/target/linux/bcm4908/patches-5.4/302-arm64-dts-broadcom-bcm4908-describe-Ethernet-control.patch b/target/linux/bcm4908/patches-5.4/130-0002-arm64-dts-broadcom-bcm4908-describe-Ethernet-control.patch
similarity index 88%
rename from target/linux/bcm4908/patches-5.4/302-arm64-dts-broadcom-bcm4908-describe-Ethernet-control.patch
rename to target/linux/bcm4908/patches-5.4/130-0002-arm64-dts-broadcom-bcm4908-describe-Ethernet-control.patch
index ed8fac387f..30487851c1 100644
--- a/target/linux/bcm4908/patches-5.4/302-arm64-dts-broadcom-bcm4908-describe-Ethernet-control.patch
+++ b/target/linux/bcm4908/patches-5.4/130-0002-arm64-dts-broadcom-bcm4908-describe-Ethernet-control.patch
@@ -1,5 +1,5 @@
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
-Date: Mon, 8 Feb 2021 09:11:36 +0100
+Date: Mon, 15 Feb 2021 19:51:26 +0100
Subject: [PATCH] arm64: dts: broadcom: bcm4908: describe Ethernet controller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -9,6 +9,8 @@ BCM4908 SoCs have an integrated Ethernet controller.
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
+ .../boot/dts/broadcom/bcm4908/bcm4908.dtsi | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
@@ -35,8 +37,8 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+ port at 8 {
+ reg = <8>;
+ phy-mode = "internal";
-+ brcm,use-bcm-hdr;
+ ethernet = <&enet>;
++ brcm,use-bcm-hdr;
+
+ fixed-link {
+ speed = <1000>;
diff --git a/target/linux/bcm4908/patches-5.4/130-0003-arm64-dts-broadcom-bcm4908-describe-Netgear-R8000P-s.patch b/target/linux/bcm4908/patches-5.4/130-0003-arm64-dts-broadcom-bcm4908-describe-Netgear-R8000P-s.patch
new file mode 100644
index 0000000000..1ee59d7e2d
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.4/130-0003-arm64-dts-broadcom-bcm4908-describe-Netgear-R8000P-s.patch
@@ -0,0 +1,48 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Mon, 15 Feb 2021 19:52:58 +0100
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: describe Netgear R8000P switch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+R8000P model has 4 LAN ports and 1 WAN port.
+
+Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+---
+ .../bcm4908/bcm4906-netgear-r8000p.dts | 25 +++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
++++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
+@@ -43,6 +43,31 @@
+ status = "okay";
+ };
+
++&ports {
++ port at 0 {
++ label = "lan4";
++ };
++
++ port at 1 {
++ label = "lan3";
++ };
++
++ port at 2 {
++ label = "lan2";
++ };
++
++ port at 3 {
++ label = "lan1";
++ };
++
++ port at 7 {
++ reg = <7>;
++ phy-mode = "internal";
++ phy-handle = <&phy12>;
++ label = "wan";
++ };
++};
++
+ &nandcs {
+ nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
diff --git a/target/linux/bcm4908/patches-5.4/130-0004-arm64-dts-broadcom-bcm4908-add-remaining-Netgear-R80.patch b/target/linux/bcm4908/patches-5.4/130-0004-arm64-dts-broadcom-bcm4908-add-remaining-Netgear-R80.patch
new file mode 100644
index 0000000000..c192c35df0
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.4/130-0004-arm64-dts-broadcom-bcm4908-add-remaining-Netgear-R80.patch
@@ -0,0 +1,78 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Mon, 15 Feb 2021 20:05:41 +0100
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: add remaining Netgear R8000P
+ LEDs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are a few more GPIO connected LEDs there didn't get described
+initially.
+
+Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+---
+ .../bcm4908/bcm4906-netgear-r8000p.dts | 48 +++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
++++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
+@@ -18,11 +18,59 @@
+ leds {
+ compatible = "gpio-leds";
+
++ power-white {
++ function = LED_FUNCTION_POWER;
++ color = <LED_COLOR_ID_WHITE>;
++ gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
++ };
++
++ power-amber {
++ function = LED_FUNCTION_POWER;
++ color = <LED_COLOR_ID_AMBER>;
++ gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
++ };
++
+ wps {
+ function = LED_FUNCTION_WPS;
+ color = <LED_COLOR_ID_WHITE>;
+ gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+ };
++
++ 2ghz {
++ function = "2ghz";
++ color = <LED_COLOR_ID_WHITE>;
++ gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
++ };
++
++ 5ghz-1 {
++ function = "5ghz-1";
++ color = <LED_COLOR_ID_WHITE>;
++ gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
++ };
++
++ 5ghz-2 {
++ function = "5ghz-2";
++ color = <LED_COLOR_ID_WHITE>;
++ gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
++ };
++
++ usb2 {
++ function = "usb2";
++ color = <LED_COLOR_ID_WHITE>;
++ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
++ };
++
++ usb3 {
++ function = "usb3";
++ color = <LED_COLOR_ID_WHITE>;
++ gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
++ };
++
++ wifi {
++ function = "wifi";
++ color = <LED_COLOR_ID_WHITE>;
++ gpios = <&gpio0 56 GPIO_ACTIVE_LOW>;
++ };
+ };
+ };
+
diff --git a/target/linux/bcm4908/patches-5.4/301-arm64-dts-broadcom-bcm4908-improve-partitions-descri.patch b/target/linux/bcm4908/patches-5.4/130-0005-arm64-dts-broadcom-bcm4908-describe-firmware-partiti.patch
similarity index 59%
rename from target/linux/bcm4908/patches-5.4/301-arm64-dts-broadcom-bcm4908-improve-partitions-descri.patch
rename to target/linux/bcm4908/patches-5.4/130-0005-arm64-dts-broadcom-bcm4908-describe-firmware-partiti.patch
index 524a433335..10f33f5140 100644
--- a/target/linux/bcm4908/patches-5.4/301-arm64-dts-broadcom-bcm4908-improve-partitions-descri.patch
+++ b/target/linux/bcm4908/patches-5.4/130-0005-arm64-dts-broadcom-bcm4908-describe-firmware-partiti.patch
@@ -1,23 +1,22 @@
-From e401e6fe9195eabfc6c81d8aed920a75b5d7987b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
-Date: Wed, 20 Jan 2021 20:53:35 +0100
-Subject: [PATCH] arm64: dts: broadcom: bcm4908: improve partitions description
+Date: Mon, 15 Feb 2021 20:30:09 +0100
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: describe firmware partitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-1. Use proper bindings
-2. Add missing partitions
+BCM4908 bootloader supports multiple firmware partitions and has its own
+bindings defined for them.
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
- .../bcm4908/bcm4906-netgear-r8000p.dts | 1 +
- .../bcm4908/bcm4908-asus-gt-ac5300.dts | 27 ++++++++++++++++++-
- 2 files changed, 27 insertions(+), 1 deletion(-)
+ .../dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts | 1 +
+ .../dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
-@@ -62,6 +62,7 @@
+@@ -135,6 +135,7 @@
};
partition at 100000 {
@@ -27,7 +26,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
};
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
-@@ -121,7 +121,7 @@
+@@ -122,7 +122,7 @@
#size-cells = <0>;
partitions {
@@ -36,7 +35,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
#address-cells = <1>;
#size-cells = <1>;
-@@ -129,5 +129,30 @@
+@@ -130,5 +130,15 @@
label = "cferom";
reg = <0x0 0x100000>;
};
@@ -49,21 +48,6 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+ partition at 5800000 {
+ compatible = "brcm,bcm4908-firmware";
+ reg = <0x5800000 0x5700000>;
-+ };
-+
-+ partition at af00000 {
-+ label = "misc1";
-+ reg = <0xaf00000 0x800000>;
-+ };
-+
-+ partition at b700000 {
-+ label = "misc2";
-+ reg = <0xb700000 0x4000000>;
-+ };
-+
-+ partition at f700000 {
-+ label = "data";
-+ reg = <0xf700000 0x800000>;
+ };
};
};
More information about the lede-commits
mailing list