aio-3399b/ImmortalWrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ramips: use fixed layout cell "mac-base" for Ubiquiti EdgeRouter X

Browse Source 
This drops a use of downstream "mac-address-increment".

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2023-07-14 10:49:04 +02:00
parent f1492fcc09
commit 28b6224104
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
View File

@ -72,9 +72,8 @@
label = "eth5";
phy-handle = <&ephy7>;
phy-mode = "rgmii-rxid";
nvmem-cells = <&macaddr_factory_22>;
nvmem-cells = <&macaddr_factory_22 5>;
nvmem-cell-names = "mac-address";
mac-address-increment = <5>;
};
};
};

37
target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
View File

@ -20,7 +20,7 @@
};
&gmac0 {
nvmem-cells = <&macaddr_factory_22>;
nvmem-cells = <&macaddr_factory_22 0>;
nvmem-cell-names = "mac-address";
label = "dsa";
};
@ -35,33 +35,29 @@
port@1 {
status = "okay";
label = "eth1";
nvmem-cells = <&macaddr_factory_22>;
nvmem-cells = <&macaddr_factory_22 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
port@2 {
status = "okay";
label = "eth2";
nvmem-cells = <&macaddr_factory_22>;
nvmem-cells = <&macaddr_factory_22 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
port@3 {
status = "okay";
label = "eth3";
nvmem-cells = <&macaddr_factory_22>;
nvmem-cells = <&macaddr_factory_22 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};
port@4 {
status = "okay";
label = "eth4";
nvmem-cells = <&macaddr_factory_22>;
nvmem-cells = <&macaddr_factory_22 4>;
nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
};
};
};
@ -87,8 +83,21 @@
};
factory: partition@e0000 {
compatible = "nvmem-cells";
label = "factory";
reg = <0xe0000 0x60000>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_22: macaddr@22 {
compatible = "mac-base";
reg = <0x22 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@140000 {
@ -146,13 +155,3 @@
&xhci {
status = "disabled";
};
&factory {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_22: macaddr@22 {
reg = <0x22 0x6>;
};
};