Allows getting rid of deprecated mac-address-increment.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
};
ð1 {
- nvmem-cells = <&macaddr_uboot_1fc00>;
+ nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
nvmem-cell-names = "mac-address";
- mac-address-increment = <(-1)>;
};
};
ð1 {
- nvmem-cells = <&macaddr_uboot_1fc00>;
+ nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address";
};
};
ð1 {
- nvmem-cells = <&macaddr_uboot_1fc00>;
+ nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address";
};
label = "config";
reg = <0x750000 0x0a0000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_config_8: macaddr@8 {
+ compatible = "mac-base";
+ reg = <0x8 0x6>;
+ #nvmem-cell-cells = <1>;
+ };
+ };
};
art: partition@7f0000 {
phy-handle = <&swphy0>;
- nvmem-cells = <&macaddr_config_8>;
+ nvmem-cells = <&macaddr_config_8 1>;
nvmem-cell-names = "mac-address";
- mac-address-increment = <1>;
};
ð1 {
status = "okay";
- nvmem-cells = <&macaddr_config_8>;
+ nvmem-cells = <&macaddr_config_8 0>;
nvmem-cell-names = "mac-address";
};
status = "okay";
mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_config_8>;
+ nvmem-cells = <&macaddr_config_8 0>;
nvmem-cell-names = "mac-address";
};
-
-&config {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_config_8: macaddr@8 {
- reg = <0x8 0x6>;
- };
-};
label = "u-boot";
reg = <0x000000 0x020000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_uboot_1fc00: macaddr@1fc00 {
+ compatible = "mac-base";
+ reg = <0x1fc00 0x6>;
+ #nvmem-cell-cells = <1>;
+ };
+ };
};
partition@20000 {
phy-handle = <&swphy4>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
+ nvmem-cells = <&macaddr_uboot_1fc00 1>;
nvmem-cell-names = "mac-address";
- mac-address-increment = <1>;
};
ð1 {
status = "okay";
mtd-cal-data = <&art 0x1000>;
- nvmem-cells = <&macaddr_uboot_1fc00>;
+ nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr@1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};