ath79: qcn: convert to nvmem-layout

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:25:18 -08:00
parent b2f1c6ed52
commit ede82f35eb
4 changed files with 58 additions and 50 deletions

View File

@ -133,8 +133,6 @@
reg = <0xff0000 0x10000>;
read-only;
compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;

View File

@ -85,20 +85,22 @@
reg = <0x050000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
cal_factory_1000: cal@1000 {
reg = <0x1000 0x440>;
};
cal_factory_1000: cal@1000 {
reg = <0x1000 0x440>;
};
macaddr_factory_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
macaddr_factory_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
precal_factory_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_factory_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
};

View File

@ -182,20 +182,22 @@
label = "artmtd";
reg = <0xfe0000 0x10000>;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_artmtd_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_artmtd_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_artmtd_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_artmtd_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_artmtd_c: macaddr@c {
reg = <0xc 0x6>;
macaddr_artmtd_c: macaddr@c {
reg = <0xc 0x6>;
};
};
};
@ -204,16 +206,18 @@
reg = <0xff0000 0x10000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
};

View File

@ -88,7 +88,7 @@
phy-mode = "sgmii";
phy-handle = <&phy0>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cells = <&macaddr_info_8 0>;
nvmem-cell-names = "mac-address";
};
@ -118,10 +118,8 @@
compatible = "pci168c,0046";
reg = <0 0 0 0 0>;
nvmem-cells = <&macaddr_info_8>, <&precal_art_5000>;
nvmem-cells = <&macaddr_info_8 (-1)>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(-1)>;
};
};
@ -162,16 +160,18 @@
reg = <0x050000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
@ -180,12 +180,16 @@
reg = <0x060000 0x020000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
macaddr_info_8: macaddr@8 {
compatible = "mac-base";
reg = <0x8 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
@ -234,6 +238,6 @@
/* TODO: missing support in ath9k */
status = "disabled";
nvmem-cells = <&cal_art_1000>, <&macaddr_info_8>;
nvmem-cells = <&cal_art_1000>, <&macaddr_info_8 0>;
nvmem-cell-names = "calibration", "mac-address";
};