fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mediatek: filogic: convert to nvmem-layout

Browse Source 
Will allow removing mac-address-increment.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 405bc5be13)
[applied to filogic part only]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Rosen Penev 2023-11-25 14:03:10 -08:00 committed by Tianling Shen
parent 701dc92f94
commit e21d1d4362
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
8 changed files with 87 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/mediatek/dts/mt7981a-ubnt-unifi-6-plus.dts
View File

@ -115,16 +115,18 @@
reg = <0x00000 0x10000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_eeprom_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_eeprom_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_eeprom_6: macaddr@6 {
reg = <0x6 0x6>;
macaddr_eeprom_6: macaddr@6 {
reg = <0x6 0x6>;
};
};
};

1
target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso
View File

@ -84,7 +84,6 @@
reg = <0x180000 0x200000>;
read-only;
compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;

33
target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
View File

@ -95,7 +95,7 @@
phy-mode = "2500base-x";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>;
nvmem-cells = <&macaddr_bdinfo_de00 0>;
fixed-link {
speed = <2500>;
@ -168,6 +168,18 @@
label = "bdinfo";
reg = <0x60000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_bdinfo_de00: macaddr@de00 {
compatible = "mac-base";
reg = <0xde00 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@70000 {
@ -223,8 +235,7 @@
label = "wan";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>;
mac-address-increment = <1>;
nvmem-cells = <&macaddr_bdinfo_de00 1>;
};
lan1: port@1 {
@ -232,7 +243,7 @@
label = "lan1";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>;
nvmem-cells = <&macaddr_bdinfo_de00 0>;
};
port@2 {
@ -240,7 +251,7 @@
label = "lan2";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>;
nvmem-cells = <&macaddr_bdinfo_de00 0>;
};
port@3 {
@ -248,7 +259,7 @@
label = "lan3";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>;
nvmem-cells = <&macaddr_bdinfo_de00 0>;
};
port@6 {
@ -270,13 +281,3 @@
status = "okay";
mediatek,mtd-eeprom = <&factory 0x0>;
};
&bdinfo {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_bdinfo_de00: macaddr@de00 {
reg = <0xde00 0x6>;
};
};

19
target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
View File

@ -91,7 +91,7 @@
reg = <0>;
phy-mode = "2500base-x";
phy-handle = <&phy0>;
nvmem-cells = <&macaddr>;
nvmem-cells = <&macaddr 0>;
nvmem-cell-names = "mac-address";
};
@ -100,9 +100,8 @@
reg = <1>;
phy-mode = "gmii";
phy-handle = <&int_gbe_phy>;
nvmem-cells = <&macaddr>;
nvmem-cells = <&macaddr 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
@ -179,12 +178,16 @@
reg = <0x180000 0x0200000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr: macaddr@a {
reg = <0xa 0x6>;
macaddr: macaddr@a {
compatible = "mac-base";
reg = <0xa 0x6>;
#nvmem-cell-cells = <1>;
};
};
};

17
target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
View File

@ -73,9 +73,8 @@
reg = <0>;
phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_4>;
nvmem-cells = <&macaddr_factory_4 (-1)>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
fixed-link {
speed = <2500>;
@ -177,12 +176,16 @@
reg = <0x180000 0x200000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_4: macaddr@4 {
reg = <0x4 0x6>;
macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
};
};
};

24
target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
View File

@ -136,12 +136,14 @@
reg = <0x180000 0x0200000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr: macaddr@a {
reg = <0xa 0x6>;
macaddr: macaddr@a {
reg = <0xa 0x6>;
};
};
};
@ -190,12 +192,14 @@
reg = <0xef80000 0x80000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_mrd_1fff8: macaddr@1fff8 {
reg = <0x1fff8 0x6>;
macaddr_mrd_1fff8: macaddr@1fff8 {
reg = <0x1fff8 0x6>;
};
};
};
};

30
target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
View File

@ -95,7 +95,7 @@
reg = <0>;
phy-mode = "2500base-x";
nvmem-cells = <&macaddr_config_1c>;
nvmem-cells = <&macaddr_config_1c 0>;
nvmem-cell-names = "mac-address";
fixed-link {
@ -111,9 +111,8 @@
phy-handle = <&phy7>;
phy-mode = "2500base-x";
nvmem-cells = <&macaddr_config_1c>;
nvmem-cells = <&macaddr_config_1c 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
mdio: mdio-bus {
@ -184,6 +183,18 @@
label = "config";
reg = <0x100000 0x0060000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_1c: macaddr@1c {
compatible = "mac-base";
reg = <0x1c 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
factory: partition@160000 {
@ -255,18 +266,7 @@
&wifi {
mediatek,mtd-eeprom = <&factory 0x0>;
nvmem-cells = <&macaddr_config_1c>;
nvmem-cells = <&macaddr_config_1c 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
status = "okay";
};
&config {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_1c: macaddr@1c {
reg = <0x1c 0x6>;
};
};

17
target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
View File

@ -54,9 +54,8 @@
reg = <0>;
phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_4>;
nvmem-cells = <&macaddr_factory_4 (-1)>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
fixed-link {
speed = <2500>;
@ -167,12 +166,16 @@
reg = <0x180000 0x200000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_4: macaddr@4 {
reg = <0x4 0x6>;
macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
};
};
};