Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath79: tp9343: convert to nvmem-layout

Browse source 
Allows getting rid of deprecated mac-address-increment.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-11-25 17:36:49 -08:00
parent ede82f35eb
commit de1d9da150
5 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
View file

@ -63,7 +63,6 @@
}; };
&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)>;
}; };

2
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
View file

@ -66,6 +66,6 @@
}; };
&eth1 { &eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

2
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
View file

@ -30,6 +30,6 @@
}; };
&eth1 { &eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

29
target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
View file

@ -120,6 +120,18 @@
label = "config"; label = "config";
reg = <0x750000 0x0a0000>; reg = <0x750000 0x0a0000>;
read-only; 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 { art: partition@7f0000 {
@ -136,15 +148,14 @@
phy-handle = <&swphy0>; phy-handle = <&swphy0>;
nvmem-cells = <&macaddr_config_8>; nvmem-cells = <&macaddr_config_8 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_8>; nvmem-cells = <&macaddr_config_8 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -152,16 +163,6 @@
status = "okay"; status = "okay";
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_config_8>; nvmem-cells = <&macaddr_config_8 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&config {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

27
target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
View file

@ -28,6 +28,18 @@
label = "u-boot"; label = "u-boot";
reg = <0x000000 0x020000>; reg = <0x000000 0x020000>;
read-only; 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 { partition@20000 {
@ -50,9 +62,8 @@
phy-handle = <&swphy4>; phy-handle = <&swphy4>;
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 {
@ -63,16 +74,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";
}; };
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};