mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
337 lines
6.7 KiB
Diff
337 lines
6.7 KiB
Diff
From dfa6570eb5ce2f24059caadbe2ed70034b5337bc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Mon, 15 May 2023 10:33:08 +0200
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Specify MAC addresses on Luxul devices
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use NRAM (NVMEM device) and its "et0macaddr" variable (NVMEM cell) to
|
|
point Ethernet devices to their MAC addresses.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Link: https://lore.kernel.org/r/20230515083308.7612-1-zajec5@gmail.com
|
|
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
---
|
|
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 13 +++++++++++++
|
|
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 13 +++++++++++++
|
|
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 13 +++++++++++++
|
|
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 11 +++++++++++
|
|
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 11 +++++++++++
|
|
arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 13 +++++++++++++
|
|
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 11 +++++++++++
|
|
arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 13 +++++++++++++
|
|
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 11 +++++++++++
|
|
arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 5 ++++-
|
|
10 files changed, 113 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
|
|
+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
|
|
@@ -20,6 +20,14 @@
|
|
reg = <0x00000000 0x08000000>;
|
|
};
|
|
|
|
+ nvram@1eff0000 {
|
|
+ compatible = "brcm,nvram";
|
|
+ reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ };
|
|
+ };
|
|
+
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
|
|
@@ -53,6 +61,11 @@
|
|
};
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
|
|
+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
|
|
@@ -24,6 +24,14 @@
|
|
reg = <0x00000000 0x08000000>;
|
|
};
|
|
|
|
+ nvram@1eff0000 {
|
|
+ compatible = "brcm,nvram";
|
|
+ reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ };
|
|
+ };
|
|
+
|
|
nand_controller: nand-controller@18028000 {
|
|
nand@0 {
|
|
partitions {
|
|
@@ -60,6 +68,11 @@
|
|
};
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
|
|
+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
|
|
@@ -20,6 +20,14 @@
|
|
reg = <0x00000000 0x08000000>;
|
|
};
|
|
|
|
+ nvram@1eff0000 {
|
|
+ compatible = "brcm,nvram";
|
|
+ reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ };
|
|
+ };
|
|
+
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
|
|
@@ -53,6 +61,11 @@
|
|
};
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
|
|
+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
|
|
@@ -24,6 +24,10 @@
|
|
nvram@1eff0000 {
|
|
compatible = "brcm,nvram";
|
|
reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ #nvmem-cell-cells = <1>;
|
|
+ };
|
|
};
|
|
|
|
leds {
|
|
@@ -106,6 +110,11 @@
|
|
vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr 0>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
@@ -137,6 +146,8 @@
|
|
port@4 {
|
|
reg = <4>;
|
|
label = "wan";
|
|
+ nvmem-cells = <&et0macaddr 5>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
};
|
|
|
|
port@5 {
|
|
--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
|
|
+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
|
|
@@ -25,6 +25,10 @@
|
|
nvram@1eff0000 {
|
|
compatible = "brcm,nvram";
|
|
reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ #nvmem-cell-cells = <1>;
|
|
+ };
|
|
};
|
|
|
|
leds {
|
|
@@ -61,6 +65,11 @@
|
|
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr 0>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
@@ -76,6 +85,8 @@
|
|
port@0 {
|
|
reg = <0>;
|
|
label = "wan";
|
|
+ nvmem-cells = <&et0macaddr 1>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
};
|
|
|
|
port@1 {
|
|
--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
|
|
+++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
|
|
@@ -20,6 +20,14 @@
|
|
reg = <0x00000000 0x08000000>;
|
|
};
|
|
|
|
+ nvram@1eff0000 {
|
|
+ compatible = "brcm,nvram";
|
|
+ reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ };
|
|
+ };
|
|
+
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
|
|
@@ -51,6 +59,11 @@
|
|
};
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
|
|
+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
|
|
@@ -25,6 +25,10 @@
|
|
nvram@1eff0000 {
|
|
compatible = "brcm,nvram";
|
|
reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ #nvmem-cell-cells = <1>;
|
|
+ };
|
|
};
|
|
|
|
leds {
|
|
@@ -61,6 +65,11 @@
|
|
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr 0>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
@@ -76,6 +85,8 @@
|
|
port@0 {
|
|
reg = <0>;
|
|
label = "wan";
|
|
+ nvmem-cells = <&et0macaddr 1>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
};
|
|
|
|
port@1 {
|
|
--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
|
|
+++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
|
|
@@ -22,6 +22,14 @@
|
|
<0x88000000 0x18000000>;
|
|
};
|
|
|
|
+ nvram@1eff0000 {
|
|
+ compatible = "brcm,nvram";
|
|
+ reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ };
|
|
+ };
|
|
+
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
|
|
@@ -47,6 +55,11 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
|
|
+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
|
|
@@ -25,6 +25,10 @@
|
|
nvram@1eff0000 {
|
|
compatible = "brcm,nvram";
|
|
reg = <0x1eff0000 0x10000>;
|
|
+
|
|
+ et0macaddr: et0macaddr {
|
|
+ #nvmem-cell-cells = <1>;
|
|
+ };
|
|
};
|
|
|
|
leds {
|
|
@@ -101,6 +105,11 @@
|
|
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
+&gmac0 {
|
|
+ nvmem-cells = <&et0macaddr 0>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
+};
|
|
+
|
|
&spi_nor {
|
|
status = "okay";
|
|
};
|
|
@@ -136,6 +145,8 @@
|
|
port@4 {
|
|
reg = <4>;
|
|
label = "wan";
|
|
+ nvmem-cells = <&et0macaddr 5>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
};
|
|
|
|
port@5 {
|
|
--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
|
|
+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
|
|
@@ -27,6 +27,7 @@
|
|
reg = <0x1eff0000 0x10000>;
|
|
|
|
et0macaddr: et0macaddr {
|
|
+ #nvmem-cell-cells = <1>;
|
|
};
|
|
};
|
|
|
|
@@ -76,7 +77,7 @@
|
|
};
|
|
|
|
&gmac0 {
|
|
- nvmem-cells = <&et0macaddr>;
|
|
+ nvmem-cells = <&et0macaddr 0>;
|
|
nvmem-cell-names = "mac-address";
|
|
};
|
|
|
|
@@ -119,6 +120,8 @@
|
|
port@4 {
|
|
reg = <4>;
|
|
label = "wan";
|
|
+ nvmem-cells = <&et0macaddr 5>;
|
|
+ nvmem-cell-names = "mac-address";
|
|
};
|
|
|
|
port@5 {
|