ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-11 15:33:03 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ipq40xx: remove mac-address-increment

Browse Source 
nvmem-layout allows removal

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-11-13 11:47:17 -08:00 committed by Christian Marangi
parent fe8dd23882
commit 7e316bc53a
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
17 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts
View File

@ -183,7 +183,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_gmac0: macaddr@0 { macaddr_gmac0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_gmac1: macaddr@6 { macaddr_gmac1: macaddr@6 {
@ -305,8 +307,7 @@
label = "lan2"; label = "lan2";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_gmac0>; nvmem-cells = <&macaddr_gmac0 2>;
mac-address-increment = <2>;
}; };
&swport4 { &swport4 {
@ -314,7 +315,7 @@
label = "lan1"; label = "lan1";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_gmac0>; nvmem-cells = <&macaddr_gmac0 0>;
}; };
&swport5 { &swport5 {

2
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts
View File

@ -143,7 +143,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_mac_0: macaddr@0 { macaddr_mac_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

8
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
View File

@ -129,8 +129,7 @@
&gmac { &gmac {
status = "okay"; status = "okay";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_mac_0>; nvmem-cells = <&macaddr_mac_0 2>;
mac-address-increment = <2>;
}; };
&switch { &switch {
@ -180,12 +179,11 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>; nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0 0>;
}; };
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>; nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0 1>;
mac-address-increment = <1>;
}; };

2
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts
View File

@ -143,7 +143,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_mac_0: macaddr@0 { macaddr_mac_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

2
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts
View File

@ -160,7 +160,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_mac_0: macaddr@0 { macaddr_mac_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

7
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
View File

@ -270,7 +270,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_manudata_6: macaddr@6 { macaddr_manudata_6: macaddr@6 {
compatible = "mac-base";
reg = <0x6 0x6>; reg = <0x6 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -373,14 +375,13 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_manudata_6>; nvmem-cells = <&precal_art_1000>, <&macaddr_manudata_6 0>;
qcom,ath10k-calibration-variant = "Netgear-WAC510"; qcom,ath10k-calibration-variant = "Netgear-WAC510";
}; };
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_manudata_6>; nvmem-cells = <&precal_art_5000>, <&macaddr_manudata_6 16>;
mac-address-increment = <16>;
qcom,ath10k-calibration-variant = "Netgear-WAC510"; qcom,ath10k-calibration-variant = "Netgear-WAC510";
}; };

13
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts
View File

@ -238,7 +238,7 @@
&gmac { &gmac {
status = "okay"; status = "okay";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 0>;
}; };
&switch { &switch {
@ -251,8 +251,7 @@
label = "wan"; label = "wan";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 1>;
mac-address-increment = <1>;
}; };
&swport3 { &swport3 {
@ -309,7 +308,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_0: macaddr@0 { macaddr_config_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -457,8 +458,7 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>; nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
mac-address-increment = <2>;
qcom,ath10k-calibration-variant = "ZTE-MF18A"; qcom,ath10k-calibration-variant = "ZTE-MF18A";
}; };
@ -478,8 +478,7 @@
wifi2: wifi@1,0 { wifi2: wifi@1,0 {
compatible = "pci168c,0040"; compatible = "pci168c,0040";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_9000>, <&macaddr_config_0>; nvmem-cells = <&precal_art_9000>, <&macaddr_config_0 3>;
mac-address-increment = <3>;
qcom,ath10k-calibration-variant = "ZTE-MF18A"; qcom,ath10k-calibration-variant = "ZTE-MF18A";
reg = <0x00010000 0 0 0 0>; reg = <0x00010000 0 0 0 0>;
}; };

10
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf282plus.dts
View File

@ -223,7 +223,7 @@
&gmac { &gmac {
status = "okay"; status = "okay";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 0>;
}; };
&nand { &nand {
@ -274,7 +274,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_0: macaddr@0 { macaddr_config_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -436,8 +438,7 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>; nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 1>;
mac-address-increment = <1>;
qcom,ath10k-calibration-variant = "zte,mf286d"; qcom,ath10k-calibration-variant = "zte,mf286d";
}; };
@ -448,7 +449,6 @@
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_config_0>; nvmem-cells = <&precal_art_5000>, <&macaddr_config_0 1>;
mac-address-increment = <1>;
qcom,ath10k-calibration-variant = "zte,mf286d"; qcom,ath10k-calibration-variant = "zte,mf286d";
}; };

13
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts
View File

@ -216,7 +216,7 @@
&gmac { &gmac {
status = "okay"; status = "okay";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 0>;
}; };
&nand { &nand {
@ -267,7 +267,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_0: macaddr@0 { macaddr_config_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -353,8 +355,7 @@
status = "okay"; status = "okay";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 1>;
mac-address-increment = <1>;
}; };
&tlmm { &tlmm {
@ -440,15 +441,13 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>; nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
mac-address-increment = <2>;
qcom,ath10k-calibration-variant = "zte,mf286d"; qcom,ath10k-calibration-variant = "zte,mf286d";
}; };
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_config_0>; nvmem-cells = <&precal_art_5000>, <&macaddr_config_0 3>;
mac-address-increment = <3>;
qcom,ath10k-calibration-variant = "zte,mf286d"; qcom,ath10k-calibration-variant = "zte,mf286d";
}; };

16
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
View File

@ -243,7 +243,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_mac_0: macaddr@0 { macaddr_mac_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -316,7 +318,7 @@
&gmac { &gmac {
status = "okay"; status = "okay";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_mac_0>; nvmem-cells = <&macaddr_mac_0 0>;
}; };
&switch { &switch {
@ -329,8 +331,7 @@
label = "wan"; label = "wan";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_mac_0>; nvmem-cells = <&macaddr_mac_0 1>;
mac-address-increment = <1>;
}; };
&swport5 { &swport5 {
@ -407,8 +408,7 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>; nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0 2>;
mac-address-increment = <2>;
qcom,ath10k-calibration-variant = "zte,mf289f"; qcom,ath10k-calibration-variant = "zte,mf289f";
}; };
@ -416,8 +416,7 @@
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>; nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0 3>;
mac-address-increment = <3>;
qcom,ath10k-calibration-variant = "zte,mf289f"; qcom,ath10k-calibration-variant = "zte,mf289f";
}; };
@ -436,8 +435,7 @@
wifi2: wifi@1,0 { wifi2: wifi@1,0 {
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_mac_0>; nvmem-cells = <&macaddr_mac_0 4>;
mac-address-increment = <4>;
compatible = "qcom,ath10k"; compatible = "qcom,ath10k";
reg = <0x00010000 0 0 0 0>; reg = <0x00010000 0 0 0 0>;
qcom,ath10k-calibration-variant = "zte,mf289f"; qcom,ath10k-calibration-variant = "zte,mf289f";

13
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
View File

@ -362,7 +362,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_gmac0: macaddr@0 { macaddr_gmac0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_gmac1: macaddr@6 { macaddr_gmac1: macaddr@6 {
@ -479,7 +481,7 @@
label = "wan"; label = "wan";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_gmac0>; nvmem-cells = <&macaddr_gmac0 0>;
}; };
&wifi0 { &wifi0 {
@ -495,8 +497,7 @@
qcom,ath10k-calibration-variant = "linksys-whw03v2"; qcom,ath10k-calibration-variant = "linksys-whw03v2";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0>; nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0 1>;
mac-address-increment = <1>;
}; };
&wifi1 { &wifi1 {
@ -506,8 +507,7 @@
qcom,ath10k-calibration-variant = "linksys-whw03v2"; qcom,ath10k-calibration-variant = "linksys-whw03v2";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0>; nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0 2>;
mac-address-increment = <2>;
}; };
&wifi2 { &wifi2 {
@ -517,6 +517,5 @@
qcom,ath10k-calibration-variant = "linksys-whw03v2"; qcom,ath10k-calibration-variant = "linksys-whw03v2";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0>; nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0 3>;
mac-address-increment = <3>;
}; };

2
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
View File

@ -151,7 +151,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_mfginfo_1d: macaddr@1d { macaddr_mfginfo_1d: macaddr@1d {
compatible = "mac-base";
reg = <0x1d 0x6>; reg = <0x1d 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

7
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
View File

@ -366,7 +366,9 @@
}; };
macaddr_mfginfo_45: macaddr@45 { macaddr_mfginfo_45: macaddr@45 {
compatible = "mac-base";
reg = <0x45 0x6>; reg = <0x45 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -465,14 +467,13 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_45>; nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_45 0>;
qcom,ath10k-calibration-variant = "Aruba-AP-303"; qcom,ath10k-calibration-variant = "Aruba-AP-303";
}; };
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_45>; nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_45 1>;
mac-address-increment = <1>;
qcom,ath10k-calibration-variant = "Aruba-AP-303"; qcom,ath10k-calibration-variant = "Aruba-AP-303";
}; };

2
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
View File

@ -195,7 +195,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_mfginfo_1d: macaddr@1d { macaddr_mfginfo_1d: macaddr@1d {
compatible = "mac-base";
reg = <0x1d 0x6>; reg = <0x1d 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

5
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
View File

@ -259,14 +259,13 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_1d>; nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_1d 0>;
qcom,ath10k-calibration-variant = "Aruba-AP-303"; qcom,ath10k-calibration-variant = "Aruba-AP-303";
}; };
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
nvmem-cell-names = "pre-calibration", "mac-address"; nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_1d>; nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_1d 1>;
mac-address-increment = <1>;
qcom,ath10k-calibration-variant = "Aruba-AP-303"; qcom,ath10k-calibration-variant = "Aruba-AP-303";
}; };

7
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
View File

@ -202,7 +202,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_gmac0: macaddr@0 { macaddr_gmac0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_gmac1: macaddr@6 { macaddr_gmac1: macaddr@6 {
@ -291,8 +293,7 @@
label = "lan2"; label = "lan2";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_gmac0>; nvmem-cells = <&macaddr_gmac0 2>;
mac-address-increment = <2>;
}; };
&swport4 { &swport4 {
@ -300,7 +301,7 @@
label = "lan1"; label = "lan1";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_gmac0>; nvmem-cells = <&macaddr_gmac0 0>;
}; };
&swport5 { &swport5 {

13
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
View File

@ -137,7 +137,9 @@
#size-cells = <1>; #size-cells = <1>;
mac_address: mac-address@66 { mac_address: mac-address@66 {
compatible = "mac-base";
reg = <0x66 0x6>; reg = <0x66 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -284,9 +286,8 @@
compatible = "qcom,ath10k"; compatible = "qcom,ath10k";
status = "okay"; status = "okay";
reg = <0x00010000 0 0 0 0>; reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&mac_address>; nvmem-cells = <&mac_address 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
}; };
}; };
@ -390,22 +391,20 @@
&wifi0 { &wifi0 {
status = "okay"; status = "okay";
qcom,ath10k-calibration-variant = "Meraki-MR33"; qcom,ath10k-calibration-variant = "Meraki-MR33";
nvmem-cells = <&mac_address>; nvmem-cells = <&mac_address 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };
&wifi1 { &wifi1 {
status = "okay"; status = "okay";
qcom,ath10k-calibration-variant = "Meraki-MR33"; qcom,ath10k-calibration-variant = "Meraki-MR33";
nvmem-cells = <&mac_address>; nvmem-cells = <&mac_address 3>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
}; };
&gmac { &gmac {
status = "okay"; status = "okay";
nvmem-cells = <&mac_address>; nvmem-cells = <&mac_address 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };