ramips: convert the remaining mtd-mac-address to NVMEM format

`mtd-mac-address` has been abandoned. Therefore, convert them to
NVMEM format. This patch also removes some useless mtd-mac-address
properties.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
This commit is contained in:
Shiji Yang 2023-10-02 11:42:08 +08:00 committed by Christian Marangi
parent c9e6831a89
commit 58502650e1
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
3 changed files with 33 additions and 13 deletions

View file

@ -93,9 +93,16 @@
};
factory: partition@40000 {
compatible = "nvmem-cells";
label = "factory";
reg = <0x40000 0x10000>;
#address-cells = <1>;
#size-cells = <1>;
read-only;
macaddr_factory_28: macaddr@28 {
reg = <0x28 0x6>;
};
};
partition@50000 {
@ -115,8 +122,9 @@
};
&ethernet {
mtd-mac-address = <&factory 0x28>;
mediatek,portmap = "llllw";
nvmem-cells = <&macaddr_factory_28>;
nvmem-cell-names = "mac-address";
};
&ehci {

View file

@ -110,9 +110,16 @@
};
board_data: partition@f70000 {
compatible = "nvmem-cells";
label = "board_data";
reg = <0xf70000 0x10000>;
#address-cells = <1>;
#size-cells = <1>;
read-only;
macaddr_board_data_b0: macaddr@b0 {
reg = <0xb0 0x6>;
};
};
partition@f80000 {
@ -166,8 +173,9 @@
};
&ethernet {
mtd-mac-address = <&board_data 0xb0>;
mediatek,portmap = "wllll";
nvmem-cells = <&macaddr_board_data_b0>;
nvmem-cell-names = "mac-address";
};
&ehci {
@ -180,7 +188,8 @@
&wmac {
ralink,mtd-eeprom = <&factory 0x0>;
mtd-mac-address = <&board_data 0xb0>;
nvmem-cells = <&macaddr_board_data_b0>;
nvmem-cell-names = "mac-address";
};
&state_default {

View file

@ -70,9 +70,20 @@
};
factory: partition@40000 {
compatible = "nvmem-cells";
label = "factory";
reg = <0x40000 0x10000>;
#address-cells = <1>;
#size-cells = <1>;
read-only;
macaddr_factory_8004: macaddr@8004 {
reg = <0x8004 0x6>;
};
macaddr_factory_e000: macaddr@e000 {
reg = <0xe000 0x6>;
};
};
partition@50000 {
@ -94,7 +105,8 @@
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
mtd-mac-address = < 0x8004>;
nvmem-cells = <&macaddr_factory_8004>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
};
@ -112,12 +124,3 @@
status = "okay";
mediatek,mtd-eeprom = <&factory 0x0>;
};
&factory {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_e000: macaddr@4 {
reg = <0xe000 0x6>;
};
};