From: Rosen Penev <rosenp@gmail.com>
To: "Florian Fainelli" <florian.fainelli@broadcom.com>,
"Hauke Mehrtens" <hauke@hauke-m.de>,
"Rafał Miłecki" <zajec5@gmail.com>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>
Cc: "Broadcom internal kernel review list"
<bcm-kernel-feedback-list@broadcom.com>,
"Rafał Miłecki" <rafal@milecki.pl>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Subject: [PATCH v2 21/22] ARM: dts: BCM5301X: use gmac2 as the CPU port
Date: Thu, 19 Nov 2026 00:54:51 -0800 [thread overview]
Message-ID: <20261119085452.75708-22-rosenp@gmail.com> (raw)
In-Reply-To: <20261119085452.75708-1-rosenp@gmail.com>
Port 8 is the switch's IMP port and connects to gmac2, which is present
on all Northstar SoCs. Several boards with a single CPU port use port 5
(gmac0) or port 7 (gmac1) instead. Switch them to port 8 and assign the
nvram MAC address to gmac2:
- AC87U: the MAC address is assigned to gmac0, but port 5 is disabled
and port 7 (gmac1) is the CPU port, so the interface that carries the
traffic never gets it.
- SR400AC, Luxul, R6250 and Meraki MR26/MR32: port 5 is the CPU port.
R6250 had no nvram node, so add one. gmac0 got et0macaddr through the
SPROM fallback, which gmac2 (et2macaddr) would not.
The Meraki port 5 fixed-link only repeated the bcm-ns.dtsi default, and
bcm-ns.dtsi already describes the port 8 fixed-link and links port 8 to
gmac2, so drop it.
Boards that use several CPU ports, and boards whose MAC address is only
known from the SPROM fallback (Buffalo WZR-600DHP2/WZR-1166DHP/
WZR-1166DHP2, BCM953012ER), are left unchanged.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
.../dts/broadcom/bcm4708-luxul-xap-1510.dts | 6 +++---
.../dts/broadcom/bcm4708-luxul-xwc-1000.dts | 6 +++---
.../dts/broadcom/bcm4708-netgear-r6250.dts | 18 ++++++++++++++++--
.../dts/broadcom/bcm4708-smartrg-sr400ac.dts | 8 ++------
.../dts/broadcom/bcm47081-luxul-xap-1410.dts | 6 +++---
.../dts/broadcom/bcm47081-luxul-xwr-1200.dts | 6 +++---
.../dts/broadcom/bcm4709-asus-rt-ac87u.dts | 6 +-----
.../dts/broadcom/bcm47094-luxul-abr-4500.dts | 6 +++---
.../dts/broadcom/bcm47094-luxul-xap-1610.dts | 6 +++---
.../dts/broadcom/bcm47094-luxul-xbr-4500.dts | 6 +++---
.../dts/broadcom/bcm47094-luxul-xwc-2000.dts | 6 +++---
.../dts/broadcom/bcm47094-luxul-xwr-3100.dts | 6 +++---
.../broadcom/bcm47094-luxul-xwr-3150-v1.dts | 6 +++---
.../dts/broadcom/bcm53015-meraki-mr26.dts | 19 +++++++------------
.../dts/broadcom/bcm53016-meraki-mr32.dts | 15 +++++----------
15 files changed, 61 insertions(+), 65 deletions(-)
diff --git a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
index 72e960c888ac..3375b234fc9b 100644
--- a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
@@ -61,7 +61,7 @@ button-restart {
};
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr>;
nvmem-cell-names = "mac-address";
};
@@ -83,7 +83,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -91,7 +91,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
index 750e17482371..26ac2f2ed5a3 100644
--- a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
@@ -68,7 +68,7 @@ button-restart {
};
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr>;
nvmem-cell-names = "mac-address";
};
@@ -86,7 +86,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -94,7 +94,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
index 2bdbc7d18b0e..81c2e6652a27 100644
--- a/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
@@ -26,6 +26,15 @@ memory@0 {
<0x88000000 0x08000000>;
};
+ nvram@1c080000 {
+ compatible = "brcm,nvram";
+ reg = <0x1c080000 0x180000>;
+
+ et0macaddr: et0macaddr {
+ #nvmem-cell-cells = <1>;
+ };
+ };
+
leds {
compatible = "gpio-leds";
@@ -83,6 +92,11 @@ button-restart {
};
};
+&gmac2 {
+ nvmem-cells = <&et0macaddr 0>;
+ nvmem-cell-names = "mac-address";
+};
+
&usb3 {
vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
};
@@ -120,7 +134,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -128,7 +142,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
index 03f4a6d37a67..60661dde8ca5 100644
--- a/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
@@ -128,7 +128,7 @@ &spi_nor {
status = "okay";
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr 0>;
nvmem-cell-names = "mac-address";
};
@@ -161,14 +161,10 @@ port@4 {
};
port@5 {
- label = "cpu";
- };
-
- port@7 {
status = "disabled";
};
- port@8 {
+ port@7 {
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
index 0198b5f9e4a7..2b152115d03e 100644
--- a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
@@ -61,7 +61,7 @@ button-restart {
};
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr>;
nvmem-cell-names = "mac-address";
};
@@ -79,7 +79,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -87,7 +87,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
index 73ff1694a4a0..b5664216dcef 100644
--- a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
@@ -110,7 +110,7 @@ &usb2 {
vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr 0>;
nvmem-cell-names = "mac-address";
};
@@ -146,7 +146,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -154,7 +154,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
index 2fed02ebb1d7..4114c6eda1ac 100644
--- a/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
@@ -71,7 +71,7 @@ button-restart {
};
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et1macaddr 0>;
nvmem-cell-names = "mac-address";
};
@@ -108,10 +108,6 @@ port@5 {
};
port@7 {
- label = "cpu";
- };
-
- port@8 {
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
index e374062eb5b7..00aa28a2e70e 100644
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
@@ -65,7 +65,7 @@ &usb3 {
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr 0>;
nvmem-cell-names = "mac-address";
};
@@ -105,7 +105,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -113,7 +113,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
index 3a33705c2969..04420ebf056a 100644
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
@@ -59,7 +59,7 @@ button-restart {
};
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr>;
nvmem-cell-names = "mac-address";
};
@@ -98,7 +98,7 @@ port@1 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -106,7 +106,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
index cf95af9db1e6..765b74919fcd 100644
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
@@ -65,7 +65,7 @@ &usb3 {
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr 0>;
nvmem-cell-names = "mac-address";
};
@@ -105,7 +105,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -113,7 +113,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
index 992c19e1cfa1..eb4bdf8c9c7e 100644
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
@@ -55,7 +55,7 @@ &uart1 {
status = "okay";
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr>;
nvmem-cell-names = "mac-address";
};
@@ -73,7 +73,7 @@ port@0 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -81,7 +81,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
index 4d0ba315a204..d5436d70ecbf 100644
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
@@ -105,7 +105,7 @@ &usb3 {
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr 0>;
nvmem-cell-names = "mac-address";
};
@@ -145,7 +145,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -153,7 +153,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
index 8e487f60a2cc..64d3634d130c 100644
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
@@ -76,7 +76,7 @@ button-restart {
};
};
-&gmac0 {
+&gmac2 {
nvmem-cells = <&et0macaddr 0>;
nvmem-cell-names = "mac-address";
};
@@ -136,7 +136,7 @@ port@4 {
};
port@5 {
- label = "cpu";
+ status = "disabled";
};
port@7 {
@@ -144,7 +144,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts b/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
index 08abfdc63d18..890945a5690b 100644
--- a/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
+++ b/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
@@ -58,17 +58,17 @@ &uart1 {
};
&gmac0 {
- status = "okay";
-
- nvmem-cells = <&macaddr_board_config_66>;
- nvmem-cell-names = "mac-address";
+ status = "disabled";
};
&gmac1 {
status = "disabled";
};
&gmac2 {
- status = "disabled";
+ status = "okay";
+
+ nvmem-cells = <&macaddr_board_config_66>;
+ nvmem-cell-names = "mac-address";
};
&gmac3 {
status = "disabled";
@@ -137,12 +137,7 @@ port@0 {
};
port@5 {
- label = "cpu";
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
+ status = "disabled";
};
port@7 {
@@ -150,7 +145,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
diff --git a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
index 45bd27906f29..d6dc448b2849 100644
--- a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
+++ b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
@@ -104,15 +104,15 @@ &uart2 {
};
&gmac0 {
- nvmem-cell-names = "mac-address";
- nvmem-cells = <&mac_address>;
+ status = "disabled";
};
&gmac1 {
status = "disabled";
};
&gmac2 {
- status = "disabled";
+ nvmem-cell-names = "mac-address";
+ nvmem-cells = <&mac_address>;
};
&gmac3 {
status = "disabled";
@@ -178,12 +178,7 @@ port@0 {
};
port@5 {
- label = "cpu";
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
+ status = "disabled";
};
port@7 {
@@ -191,7 +186,7 @@ port@7 {
};
port@8 {
- status = "disabled";
+ label = "cpu";
};
};
};
--
2.56.1
next prev parent reply other threads:[~2026-11-19 8:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 8:54 [PATCH v2 00/22] ARM: dts: BCM5301X: describe switches and use gmac2 as the CPU port Rosen Penev
2026-11-19 8:54 ` [PATCH v2 01/22] ARM: dts: BCM5301X: AC56U: specify switch Rosen Penev
2026-11-19 8:54 ` [PATCH v2 02/22] ARM: dts: BCM5301X: AC68U: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 03/22] ARM: dts: BCM5301X: N18U: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 04/22] ARM: dts: BCM5301X: R7000: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 05/22] ARM: dts: BCM5301X: EA6300: set gmac2 MAC address from nvram Rosen Penev
2026-11-19 8:54 ` [PATCH v2 06/22] ARM: dts: BCM5301X: EA6300: specify switch Rosen Penev
2026-11-19 8:54 ` [PATCH v2 07/22] ARM: dts: BCM5301X: phicomm-k3: add nvram node Rosen Penev
2026-11-19 8:54 ` [PATCH v2 08/22] ARM: dts: BCM5301X: phicomm-k3: specify switch Rosen Penev
2026-11-19 8:54 ` [PATCH v2 09/22] ARM: dts: BCM5301X: R6300 v2: add nvram node Rosen Penev
2026-11-19 8:54 ` [PATCH v2 10/22] ARM: dts: BCM5301X: R6300 v2: specify switch Rosen Penev
2026-11-19 8:54 ` [PATCH v2 11/22] ARM: dts: BCM5301X: EA6500 v2: add nvram node Rosen Penev
2026-11-19 8:54 ` [PATCH v2 12/22] ARM: dts: BCM5301X: EA6500 v2: specify switch Rosen Penev
2026-11-19 8:54 ` [PATCH v2 13/22] ARM: dts: BCM5301X: R8500: add nvram node Rosen Penev
2026-11-19 8:54 ` [PATCH v2 14/22] ARM: dts: BCM5301X: R8500: specify switch Rosen Penev
2026-11-19 8:54 ` [PATCH v2 15/22] ARM: dts: BCM5301X: WZR-900DHP: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 16/22] ARM: dts: BCM5301X: WZR-1750DHP: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 17/22] ARM: dts: BCM5301X: WXR-1900DHP: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 18/22] ARM: dts: BCM5301X: Archer C5 v2: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 19/22] ARM: dts: BCM5301X: Archer C9 v1: " Rosen Penev
2026-11-19 8:54 ` [PATCH v2 20/22] ARM: dts: BCM5301X: DIR-885L: use gmac2 Rosen Penev
2026-11-19 8:54 ` Rosen Penev [this message]
2026-11-19 8:54 ` [PATCH v2 22/22] ARM: dts: BCM5301X: enable GMACs in boards that use them Rosen Penev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119085452.75708-22-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=florian.fainelli@broadcom.com \
--cc=hauke@hauke-m.de \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=rafal@milecki.pl \
--cc=robh@kernel.org \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox