From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92B21606A326 for ; Thu, 19 Nov 2026 08:57:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=nB9JSCyK; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=nuQhAsRt DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=LYx7WQ2dST+Wao6Q5mfg9jnAzXBRpmGNPpjAkBgVZCY=; b=nB9JSCyKQYDUK3 xNSKWWRAPcdBPu35NCUX7tNX91phfNgtaNmidofLlVFLOk/uGkCutnN0U2t+3aWCtSGMLVYx5g8VR DFsYD0IfFVVfX8GmkNUFSU0OupBW4KSCAWf4rdRRVpY+7Xv7qPErCNulGy5VIRNjI/XA1YmXzEewK Eoyf3NieUS5r+X8i4Wrgjw1nsFK8tcAGkU419lk+VTPQHbRiWC4srcAZ2NiZXPbwFZvQ5K02vrZA4 mzyq4hecciqNaFkIvlIQJRkn5TGsY3IH8oF6B4XtZ4ylYAROYU9Cw/C0VNsLEGZeRhP3tvoQO6amN lUzUrPyoVXIDU+pCFn3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTxxD-0000000BGvr-1F9B; Thu, 19 Nov 2026 08:57:15 +0000 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTxvx-0000000BG25-2T0G for linux-arm-kernel@lists.infradead.org; Thu, 19 Nov 2026 08:55:59 +0000 Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-55ade1de0b4so21078771cf.3 for ; Thu, 19 Nov 2026 00:55:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795078556; x=1795683356; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LYx7WQ2dST+Wao6Q5mfg9jnAzXBRpmGNPpjAkBgVZCY=; b=nuQhAsRtQ4IacpAUoWzgXeynMjNnoFWtxK05VptC++nsIQ2cyXm4hetKtruMlUiRv4 TR3w421QVUBS2dFQveOYcrAcTmx9W42PUyJxDKKxa69RcSNwxMcEPkcIeb5P5sJM59I9 PuTlaMEDJXGHB8jxi/NGWgOBqBxYiwQtOMT4l8zxCXg+sJ/9bUNpZqhaVMIFwDq9AUPr dMBzmjvAmQYjlSXFkjVgibBL4RX/W/n8c4cTRqjPYWjrarK5jn3iUpE3obKdXgPlQ9oK NOl3WCs34VoT6F+uoCp3Fw9ZP6BY43MKkE6SlGcZOvBMbtMhOLQtHCEgvqynNzwT+YRE 64yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795078556; x=1795683356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=LYx7WQ2dST+Wao6Q5mfg9jnAzXBRpmGNPpjAkBgVZCY=; b=Q24UexXAKCV+FN0KjHp5KIpstKCGWFPU5pfE3OD226oYYUBLdQ8kSXXPSigroV5q3p qNHEL7E8jySvduCO6OtXgItf/65tU4y6APzXAk3fmp22ChQgSmQ+iUUyBrBXXdBxP4AT Lo04qR7HmrLwOMaPnueLWVyAj6MoDEyB3bXmXsM6CN/RbFTAkjIGb49y0Viy8RI90IvN eVV8dHiV9yXpeT04/2EXEciRzmIPREHttCILb9KBN8a0BWG6VXsMg6TZ6ces6oPjqhxX KphjIfLqgYYP0PUiTLzxaE1zfcPG0rVE+nXXJtMw0Rf1itjq+4OXuGhRpjbn+mcuMQgU JMNA== X-Forwarded-Encrypted: i=1; AL+hErFJtEhrpVh9/ZYyTbDgK7qjTclRfifZ0ftXeETeuqZViQV9LJOMkVtQp+DfAPhtYdcrEgs47nspYF13rBJz9cvX@lists.infradead.org X-Gm-Message-State: APuU4Z/cROKQ3Fu7b2pC3UlFVl8O18vQsLcTg/yDsDeLl+eZL/0nOsh8 oqtQIBcQnhUX3Q7JzzDYO0E3yr4EUUpTeszqORGyVTtjYXnNZ/3e07c/ X-Gm-Gg: AYBFou03PjL8Z+cuLcjhCsVyKzLTk2eg98ls0xml1DbRVTT8e+L8IPRY71dXANO3mlz yMcrM31a1XwCSFydLjq9OnXWXp1Q9K8lmh7KzQch8/oNIyVl7eTHq2jJxzLuZAzrfrNIoGLQZyW 9xobUHzZ3p1aSUNmu908qMM/UdoKNNF2vrQQ+RBvTVVkSRw5xBakv4+3UBVJdRxsmC2ZJmtaRwS HPu4kheLkKPURzdYw6s6hZdaQzk1DZ1grOm+w7f+6vb0POwCoo0evi1vJHBzRSNYnQTsh3fsAuS qLzCeDVRheHnBshZKe/pjV4hiK51GqM7FwSeMI63UtAtreB6EwE2LoaavWvWHecNZWI4mnrbuLK hMeW950ztCASWn0qytmzgmLivoB1fNXUpcE+PBXAA/p33feS8FVMFsV8YFen82dfhOC2Z58lybN nfHgpwvENR7yH/fp+II8NIQKchMRrD+q+bTF2RlcOmOHWoY7Sk7salXix8qhGdA9tbI+O3TcJ2O smv8fncWxKM8OZUF4C3GrkZtovb3+XN9b3qIJTBxtw7p7FjMLCt5Gndra7vAcMVoRe4hzTuytx3 Z7E5nAKts3CG7eIR3MieEL0bYh2J/2666BfjyAB3Ct/NRi0sZOFktd0JXGzd9NdfLx7j6Z3qLjQ 2lmjxplniOKd+pdz9Rs6IXrrXzOjJUyRmWagS7Wfyvo+3omYJch+oL5CKRFfiJIBtxcpB7BNr+G 6hnQ== X-Received: by 2002:ac8:5fc7:0:b0:535:28bf:5561 with SMTP id d75a77b69052e-55d5a34dccamr84092401cf.6.1795078556283; Thu, 19 Nov 2026 00:55:56 -0800 (PST) Received: from ryzen.lan ([2601:644:8000:37f::e34]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-55d66bcbeabsm19578151cf.18.2026.11.19.00.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2026 00:55:55 -0800 (PST) From: Rosen Penev To: Florian Fainelli , Hauke Mehrtens , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Broadcom internal kernel review list , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , 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 Message-ID: <20261119085452.75708-22-rosenp@gmail.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261119085452.75708-1-rosenp@gmail.com> References: <20261119085452.75708-1-rosenp@gmail.com> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261119_005557_685635_5293B2C0 X-CRM114-Status: GOOD ( 16.54 ) X-Spam-Score: -1.1 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_GMAIL_RCVD, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 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 --- .../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