This drops a use of the deprecated "mac-address-increment".
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
ath9k0: wifi@0,11 { /* 2.4 GHz */
compatible = "pci168c,0029";
ath9k0: wifi@0,11 { /* 2.4 GHz */
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>;
#gpio-cells = <2>;
gpio-controller;
reg = <0x8800 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;
ath9k1: wifi@0,12 { /* 5 GHz */
compatible = "pci168c,0029";
ath9k1: wifi@0,12 { /* 5 GHz */
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>;
#gpio-cells = <2>;
gpio-controller;
reg = <0x9000 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;
- nvmem-cells = <&macaddr_hwinfo_1c>;
+ nvmem-cells = <&macaddr_hwinfo_1c 0>;
nvmem-cell-names = "mac-address";
pll-data = <0x00110000 0x00001099 0x00991099>;
nvmem-cell-names = "mac-address";
pll-data = <0x00110000 0x00001099 0x00991099>;
};
hwinfo: partition@fe0000 {
};
hwinfo: partition@fe0000 {
reg = <0xfe0000 0x10000>;
reg = <0xfe0000 0x10000>;
+ compatible = "nvmem-cells";
+ label = "hwinfo";
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_hwinfo_1c: mac-address@1c {
+ compatible = "mac-base";
+ reg = <0x1c 0x6>;
+ #nvmem-cell-cells = <1>;
+ };
+ };
-
-&hwinfo {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_hwinfo_1c: macaddr@1c {
- reg = <0x1c 0x6>;
- };
-};