ath79: ar: convert to mac-base

Replacement for deprecated mac-address-increment

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-11-25 20:36:49 -08:00
parent 9783340af9
commit b7f26c6392
52 changed files with 235 additions and 203 deletions

View File

@ -122,9 +122,8 @@
ath9k0: wifi@0,11 { ath9k0: wifi@0,11 {
compatible = "pci168c,0029"; compatible = "pci168c,0029";
nvmem-cells = <&macaddr_hwinfo_1c>; nvmem-cells = <&macaddr_hwinfo_1c 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
reg = <0x8800 0 0 0 0>; reg = <0x8800 0 0 0 0>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
@ -132,9 +131,8 @@
ath9k1: wifi@0,12 { ath9k1: wifi@0,12 {
compatible = "pci168c,0029"; compatible = "pci168c,0029";
nvmem-cells = <&macaddr_hwinfo_1c>; nvmem-cells = <&macaddr_hwinfo_1c 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
reg = <0x9000 0 0 0 0>; reg = <0x9000 0 0 0 0>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
@ -151,7 +149,7 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_hwinfo_1c>; nvmem-cells = <&macaddr_hwinfo_1c 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii"; phy-mode = "rgmii";
@ -194,7 +192,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_hwinfo_1c: macaddr@1c { macaddr_hwinfo_1c: macaddr@1c {
compatible = "mac-base";
reg = <0x1c 0x6>; reg = <0x1c 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -159,7 +159,9 @@
}; };
macaddr_art_520c: macaddr@520c { macaddr_art_520c: macaddr@520c {
compatible = "mac-base";
reg = <0x520c 0x6>; reg = <0x520c 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -254,9 +256,8 @@
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_520c>; nvmem-cells = <&macaddr_art_520c 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
phy-handle = <&phy4>; phy-handle = <&phy4>;
}; };

View File

@ -74,9 +74,8 @@
compatible = "pci168c,0029"; compatible = "pci168c,0029";
reg = <0x8800 0 0 0 0>; reg = <0x8800 0 0 0 0>;
qca,no-eeprom; qca,no-eeprom;
nvmem-cells = <&macaddr_config_66>; nvmem-cells = <&macaddr_config_66 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
@ -85,9 +84,8 @@
compatible = "pci168c,0029"; compatible = "pci168c,0029";
reg = <0x9000 0 0 0 0>; reg = <0x9000 0 0 0 0>;
qca,no-eeprom; qca,no-eeprom;
nvmem-cells = <&macaddr_config_66>; nvmem-cells = <&macaddr_config_66 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
@ -103,7 +101,7 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_config_66>; nvmem-cells = <&macaddr_config_66 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
pll-data = <0x00110000 0x00001099 0x00991099>; pll-data = <0x00110000 0x00001099 0x00991099>;
@ -148,7 +146,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_66: macaddr@66 { macaddr_config_66: macaddr@66 {
compatible = "mac-base";
reg = <0x66 0x6>; reg = <0x66 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -126,7 +126,9 @@
}; };
macaddr_art_520c: macaddr@520c { macaddr_art_520c: macaddr@520c {
compatible = "mac-base";
reg = <0x520c 0x6>; reg = <0x520c 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {
@ -157,9 +159,8 @@
ath9k1: wifi@0,12 { ath9k1: wifi@0,12 {
compatible = "pci168c,0029"; compatible = "pci168c,0029";
reg = <0x9000 0 0 0 0>; reg = <0x9000 0 0 0 0>;
nvmem-cells = <&macaddr_art_520c>, <&calibration_art_5000>; nvmem-cells = <&macaddr_art_520c 1>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <1>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };

View File

@ -154,7 +154,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_120c: macaddr@120c { macaddr_art_120c: macaddr@120c {
compatible = "mac-base";
reg = <0x120c 0x6>; reg = <0x120c 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -163,16 +165,15 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_120c>; nvmem-cells = <&macaddr_art_120c 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_120c>; nvmem-cells = <&macaddr_art_120c 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&pcie { &pcie {
@ -182,7 +183,7 @@
compatible = "pci168c,002a"; compatible = "pci168c,002a";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
qca,no-eeprom; qca,no-eeprom;
nvmem-cells = <&macaddr_art_120c>; nvmem-cells = <&macaddr_art_120c 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;

View File

@ -175,7 +175,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_art_6: macaddr@6 { macaddr_art_6: macaddr@6 {
@ -188,7 +190,7 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -205,9 +207,8 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "pci168c,002b"; compatible = "pci168c,002b";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
qca,no-eeprom; qca,no-eeprom;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;

View File

@ -108,7 +108,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_art_6: macaddr@6 { macaddr_art_6: macaddr@6 {
@ -121,7 +123,7 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -138,9 +140,8 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "pci168c,002b"; compatible = "pci168c,002b";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
qca,no-eeprom; qca,no-eeprom;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;

View File

@ -84,7 +84,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -114,7 +116,7 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
qca,no-eeprom; qca,no-eeprom;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;

View File

@ -30,15 +30,13 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };
&eth1 { &eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&ath9k { &ath9k {

View File

@ -178,7 +178,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_art_6: macaddr@6 { macaddr_art_6: macaddr@6 {
@ -193,7 +195,7 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -210,9 +212,8 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "pci168c,002e"; compatible = "pci168c,002e";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
qca,no-eeprom; qca,no-eeprom;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;

View File

@ -42,7 +42,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_art_6: macaddr@6 { macaddr_art_6: macaddr@6 {
@ -53,7 +55,7 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -63,7 +65,6 @@
}; };
&ath9k { &ath9k {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };

View File

@ -42,7 +42,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_art_6: macaddr@6 { macaddr_art_6: macaddr@6 {
@ -53,7 +55,7 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -63,7 +65,6 @@
}; };
&ath9k { &ath9k {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };

View File

@ -71,7 +71,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -99,7 +101,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
qca,no-eeprom; qca,no-eeprom;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
}; };
@ -107,12 +109,11 @@
&eth0 { /* WAN interface, initialized last as eth1 */ &eth0 { /* WAN interface, initialized last as eth1 */
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { /* LAN interface, initialized first as eth0 */ &eth1 { /* LAN interface, initialized first as eth0 */
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -109,7 +109,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -138,7 +140,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
qca,no-eeprom; qca,no-eeprom;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
}; };
@ -146,13 +148,11 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };
&eth1 { &eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };

View File

@ -63,7 +63,7 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-handle = <&phy4>; phy-handle = <&phy4>;
@ -78,9 +78,8 @@
ath9k: wifi@0,0,0 { ath9k: wifi@0,0,0 {
compatible = "pci168c,002a"; compatible = "pci168c,002a";
reg = <0x0 0 0 0 0>; reg = <0x0 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
qca,no-eeprom; qca,no-eeprom;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
@ -94,7 +93,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -63,7 +63,7 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-handle = <&phy4>; phy-handle = <&phy4>;
@ -78,9 +78,8 @@
ath9k: wifi@0,0,0 { ath9k: wifi@0,0,0 {
compatible = "pci168c,002a"; compatible = "pci168c,002a";
reg = <0x0 0 0 0 0>; reg = <0x0 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
qca,no-eeprom; qca,no-eeprom;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
@ -94,7 +93,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -74,9 +74,8 @@
compatible = "pci168c,002a"; compatible = "pci168c,002a";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
qca,no-eeprom; qca,no-eeprom;
nvmem-cells = <&macaddr_config_66>; nvmem-cells = <&macaddr_config_66 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
}; };
@ -91,7 +90,7 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_config_66>; nvmem-cells = <&macaddr_config_66 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
pll-data = <0x02000000 0x00000101 0x00001313>; pll-data = <0x02000000 0x00000101 0x00001313>;
@ -107,7 +106,7 @@
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_config_66>; nvmem-cells = <&macaddr_config_66 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -147,7 +146,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_66: macaddr@66 { macaddr_config_66: macaddr@66 {
compatible = "mac-base";
reg = <0x66 0x6>; reg = <0x66 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -85,7 +85,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -96,16 +98,15 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };
&wmac { &wmac {

View File

@ -24,9 +24,8 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;
@ -39,9 +38,8 @@
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&pinmux { &pinmux {
@ -75,7 +73,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -72,9 +72,8 @@
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;
@ -107,7 +106,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -132,6 +133,6 @@
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -109,15 +109,14 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -151,7 +150,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>;
}; };
}; };
}; };
@ -200,7 +201,6 @@
status = "okay"; status = "okay";
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };

View File

@ -32,7 +32,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -53,19 +55,18 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&eth1 { &eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };
&wmac { &wmac {
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -108,7 +108,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -131,9 +133,8 @@
&eth0 { /* WAN interface, initialized last as eth1 */ &eth0 { /* WAN interface, initialized last as eth1 */
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;
@ -146,7 +147,7 @@
&eth1 { /* LAN interface, initialized first as eth0 */ &eth1 { /* LAN interface, initialized first as eth0 */
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -154,6 +155,6 @@
status = "okay"; status = "okay";
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -125,7 +125,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -143,16 +145,15 @@
status = "okay"; status = "okay";
phy-handle = <&swphy0>; phy-handle = <&swphy0>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { &eth1 {
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
pll-data = <0x06000000 0x00000101 0x00001616>; pll-data = <0x06000000 0x00000101 0x00001616>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
gmac-config { gmac-config {

View File

@ -71,7 +71,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -100,19 +102,18 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };
&eth1 { &eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wmac { &wmac {
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -54,7 +54,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -75,19 +77,18 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };
&eth1 { &eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wmac { &wmac {
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -72,7 +72,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -101,21 +103,20 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };
&eth1 { &eth1 {
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wmac { &wmac {
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -64,7 +64,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -85,19 +87,18 @@
}; };
&eth0 { // WAN port, initialized last as eth1 &eth0 { // WAN port, initialized last as eth1
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { // LAN ports, initialized first as eth0 &eth1 { // LAN ports, initialized first as eth0
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wmac { &wmac {
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -106,9 +106,8 @@
compatible = "pci168c,0030"; compatible = "pci168c,0030";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_hw_info_0>; nvmem-cells = <&macaddr_hw_info_0 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };
}; };
@ -148,7 +147,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_hw_info_0: macaddr@0 { macaddr_hw_info_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -171,9 +172,8 @@
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_hw_info_0>; nvmem-cells = <&macaddr_hw_info_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&nand { &nand {
@ -227,7 +227,7 @@
pll-data = <0x06000000 0x00000101 0x00001313>; pll-data = <0x06000000 0x00000101 0x00001313>;
nvmem-cells = <&macaddr_hw_info_0>; nvmem-cells = <&macaddr_hw_info_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";

View File

@ -72,7 +72,7 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-handle = <&phy0>; phy-handle = <&phy0>;
@ -87,9 +87,8 @@
ath9k: wifi@0,0,0 { ath9k: wifi@0,0,0 {
compatible = "pci168c,0030"; compatible = "pci168c,0030";
reg = <0x0 0 0 0 0>; reg = <0x0 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>; nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <1>;
ieee80211-freq-limit = <2402000 2482000>; ieee80211-freq-limit = <2402000 2482000>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
@ -101,9 +100,8 @@
ieee80211-freq-limit = <4900000 5990000>; ieee80211-freq-limit = <4900000 5990000>;
nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_art_0 2>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <2>;
}; };
&art { &art {
@ -113,7 +111,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {

View File

@ -123,7 +123,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_1002: macaddr@1002 { macaddr_art_1002: macaddr@1002 {
compatible = "mac-base";
reg = <0x1002 0x6>; reg = <0x1002 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -140,9 +142,8 @@
pll-data = <0x02000000 0x00000101 0x00001616>; pll-data = <0x02000000 0x00000101 0x00001616>;
nvmem-cells = <&macaddr_art_1002>; nvmem-cells = <&macaddr_art_1002 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;

View File

@ -29,22 +29,20 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 (-2)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
}; };
&pcie { &pcie {
wifi@0,0,0 { wifi@0,0,0 {
nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>; nvmem-cells = <&macaddr_art_0 0>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
}; };
}; };
&wmac { &wmac {
nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-1)>;
}; };
&art { &art {
@ -54,7 +52,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {

View File

@ -24,22 +24,20 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&pcie { &pcie {
wifi@0,0,0 { wifi@0,0,0 {
nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>; nvmem-cells = <&macaddr_art_0 (-2)>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-2)>;
}; };
}; };
&wmac { &wmac {
nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-1)>;
}; };
&art { &art {
@ -49,7 +47,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {

View File

@ -81,7 +81,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {
@ -112,7 +114,7 @@
pll-data = <0x02000000 0x00000101 0x00001313>; pll-data = <0x02000000 0x00000101 0x00001313>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
@ -129,9 +131,8 @@
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <1>;
}; };
&pcie { &pcie {
@ -140,9 +141,8 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "pci168c,0030"; compatible = "pci168c,0030";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>; nvmem-cells = <&macaddr_art_0 8>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <8>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;

View File

@ -159,7 +159,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {
@ -190,7 +192,7 @@
pll-data = <0x02000000 0x00000101 0x00001313>; pll-data = <0x02000000 0x00000101 0x00001313>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
@ -208,17 +210,15 @@
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_art_0 2>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <2>;
}; };
&pcie { &pcie {
@ -227,8 +227,7 @@
wifi@0,0 { wifi@0,0 {
compatible = "pci168c,0030"; compatible = "pci168c,0030";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>; nvmem-cells = <&macaddr_art_0 16>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <16>;
}; };
}; };

View File

@ -114,7 +114,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -128,9 +130,8 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "168c,0030"; compatible = "168c,0030";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 (-2)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
mtd-cal-data = <&art 0x5000>; mtd-cal-data = <&art 0x5000>;
qca,no-eeprom; qca,no-eeprom;
ieee80211-freq-limit = <2402000 2482000>; ieee80211-freq-limit = <2402000 2482000>;
@ -144,9 +145,8 @@
ieee80211-freq-limit = <4900000 5990000>; ieee80211-freq-limit = <4900000 5990000>;
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };
&mdio0 { &mdio0 {
@ -164,7 +164,7 @@
/* default for ar934x, except for 1000M */ /* default for ar934x, except for 1000M */
pll-data = <0x06000000 0x00000101 0x00001616>; pll-data = <0x06000000 0x00000101 0x00001616>;
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii"; phy-mode = "rgmii";

View File

@ -24,15 +24,14 @@
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_pridata_400>; nvmem-cells = <&macaddr_pridata_400 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_pridata_400>; nvmem-cells = <&macaddr_pridata_400 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
gmac-config { gmac-config {

View File

@ -24,15 +24,14 @@
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_pridata_400>; nvmem-cells = <&macaddr_pridata_400 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_pridata_400>; nvmem-cells = <&macaddr_pridata_400 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
gmac-config { gmac-config {

View File

@ -31,7 +31,7 @@
pll-data = <0x06000000 0x00000101 0x00001616>; pll-data = <0x06000000 0x00000101 0x00001616>;
nvmem-cells = <&macaddr_pridata_400>; nvmem-cells = <&macaddr_pridata_400 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii"; phy-mode = "rgmii";

View File

@ -31,7 +31,7 @@
pll-data = <0x06000000 0x00000101 0x00001616>; pll-data = <0x06000000 0x00000101 0x00001616>;
nvmem-cells = <&macaddr_pridata_400>; nvmem-cells = <&macaddr_pridata_400 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii"; phy-mode = "rgmii";

View File

@ -92,7 +92,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_pridata_400: macaddr@400 { macaddr_pridata_400: macaddr@400 {
compatible = "mac-base";
reg = <0x400 0x6>; reg = <0x400 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -66,9 +66,8 @@
phy-handle = <&swphy0>; phy-handle = <&swphy0>;
nvmem-cells = <&macaddr_art_1002>; nvmem-cells = <&macaddr_art_1002 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;
@ -79,7 +78,7 @@
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_art_1002>; nvmem-cells = <&macaddr_art_1002 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -144,7 +143,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_1002: macaddr@1002 { macaddr_art_1002: macaddr@1002 {
compatible = "mac-base";
reg = <0x1002 0x6>; reg = <0x1002 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View File

@ -164,15 +164,14 @@
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -163,15 +163,14 @@
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -86,7 +86,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>;
}; };
}; };
}; };
@ -154,9 +156,8 @@
status = "okay"; status = "okay";
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_config_0>; nvmem-cells = <&macaddr_config_0 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };
&pinmux { &pinmux {

View File

@ -49,16 +49,30 @@
status = "okay"; status = "okay";
}; };
&ath9k { &wmac {
mac-address-increment = <1>; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
};
&pcie {
status = "okay";
ath9k: wifi@0,0 {
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;
nvmem-cells = <&macaddr_uboot_1fc00 1>, <&cal_art_5000>;
nvmem-cell-names = "mac-address", "calibration";
};
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;
@ -72,7 +86,6 @@
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };

View File

@ -76,7 +76,22 @@
}; };
&wmac { &wmac {
mac-address-increment = <(-1)>; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00 (-1)>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
};
&pcie {
status = "okay";
ath9k: wifi@0,0 {
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;
nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_5000>;
nvmem-cell-names = "mac-address", "calibration";
};
}; };
&mdio0 { &mdio0 {
@ -104,7 +119,7 @@
/* default for ar934x, except for 1000M */ /* default for ar934x, except for 1000M */
pll-data = <0x06000000 0x00000101 0x00001616>; pll-data = <0x06000000 0x00000101 0x00001616>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-mode = "rgmii"; phy-mode = "rgmii";

View File

@ -90,7 +90,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -123,22 +125,3 @@
}; };
}; };
}; };
&pcie {
status = "okay";
ath9k: wifi@0,0 {
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;
nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_5000>;
nvmem-cell-names = "mac-address", "calibration";
};
};
&wmac {
status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
};

View File

@ -102,7 +102,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -143,7 +145,7 @@
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -152,15 +154,14 @@
phy-handle = <&swphy0>; phy-handle = <&swphy0>;
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth1 { &eth1 {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
gmac-config { gmac-config {

View File

@ -56,9 +56,8 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 (-2)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
}; };
&pcie { &pcie {
@ -73,9 +72,8 @@
&wmac { &wmac {
/delete-property/ ieee80211-freq-limit; /delete-property/ ieee80211-freq-limit;
nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_art_0 (-2)>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-2)>;
}; };
&art { &art {
@ -85,7 +83,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {

View File

@ -56,23 +56,20 @@
}; };
&eth0 { &eth0 {
nvmem-cells = <&macaddr_art_0>; nvmem-cells = <&macaddr_art_0 (-2)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
}; };
&pcie { &pcie {
wifi@0,0,0 { wifi@0,0,0 {
nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>; nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-1)>;
}; };
}; };
&wmac { &wmac {
nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_art_0 (-2)>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-2)>;
}; };
&art { &art {
@ -82,7 +79,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
calibration_art_1000: calibration@1000 { calibration_art_1000: calibration@1000 {

View File

@ -150,7 +150,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_addr_0: macaddr@0 { macaddr_addr_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -164,9 +166,8 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "pci168c,0030"; compatible = "pci168c,0030";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_addr_0>, <&calibration_art_5000>; nvmem-cells = <&macaddr_addr_0 0x10>, <&calibration_art_5000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <0x10>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
}; };
@ -183,7 +184,7 @@
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&macaddr_addr_0>, <&calibration_art_1000>; nvmem-cells = <&macaddr_addr_0 0>, <&calibration_art_1000>;
nvmem-cell-names = "mac-address", "calibration"; nvmem-cell-names = "mac-address", "calibration";
}; };
@ -200,9 +201,8 @@
pll-data = <0xe000000 0x04000101 0x04001313>; pll-data = <0xe000000 0x04000101 0x04001313>;
nvmem-cells = <&macaddr_addr_0>; nvmem-cells = <&macaddr_addr_0 0x21>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <0x21>;
phy-mode = "rgmii-rxid"; phy-mode = "rgmii-rxid";
phy-handle = <&phy4>; phy-handle = <&phy4>;