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:
parent
b2f1c6ed52
commit
ede82f35eb
@ -133,8 +133,6 @@
|
|||||||
reg = <0xff0000 0x10000>;
|
reg = <0xff0000 0x10000>;
|
||||||
read-only;
|
read-only;
|
||||||
|
|
||||||
compatible = "nvmem-cells";
|
|
||||||
|
|
||||||
nvmem-layout {
|
nvmem-layout {
|
||||||
compatible = "fixed-layout";
|
compatible = "fixed-layout";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
@ -85,7 +85,8 @@
|
|||||||
reg = <0x050000 0x010000>;
|
reg = <0x050000 0x010000>;
|
||||||
read-only;
|
read-only;
|
||||||
|
|
||||||
compatible = "nvmem-cells";
|
nvmem-layout {
|
||||||
|
compatible = "fixed-layout";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
@ -103,6 +104,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&wmac {
|
&wmac {
|
||||||
|
@ -182,7 +182,8 @@
|
|||||||
label = "artmtd";
|
label = "artmtd";
|
||||||
reg = <0xfe0000 0x10000>;
|
reg = <0xfe0000 0x10000>;
|
||||||
|
|
||||||
compatible = "nvmem-cells";
|
nvmem-layout {
|
||||||
|
compatible = "fixed-layout";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
@ -198,13 +199,15 @@
|
|||||||
reg = <0xc 0x6>;
|
reg = <0xc 0x6>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
partition@ff0000 {
|
partition@ff0000 {
|
||||||
label = "art";
|
label = "art";
|
||||||
reg = <0xff0000 0x10000>;
|
reg = <0xff0000 0x10000>;
|
||||||
read-only;
|
read-only;
|
||||||
|
|
||||||
compatible = "nvmem-cells";
|
nvmem-layout {
|
||||||
|
compatible = "fixed-layout";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
@ -218,6 +221,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@
|
|||||||
phy-mode = "sgmii";
|
phy-mode = "sgmii";
|
||||||
phy-handle = <&phy0>;
|
phy-handle = <&phy0>;
|
||||||
|
|
||||||
nvmem-cells = <&macaddr_info_8>;
|
nvmem-cells = <&macaddr_info_8 0>;
|
||||||
nvmem-cell-names = "mac-address";
|
nvmem-cell-names = "mac-address";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -118,10 +118,8 @@
|
|||||||
compatible = "pci168c,0046";
|
compatible = "pci168c,0046";
|
||||||
reg = <0 0 0 0 0>;
|
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";
|
nvmem-cell-names = "mac-address", "pre-calibration";
|
||||||
|
|
||||||
mac-address-increment = <(-1)>;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -162,7 +160,8 @@
|
|||||||
reg = <0x050000 0x010000>;
|
reg = <0x050000 0x010000>;
|
||||||
read-only;
|
read-only;
|
||||||
|
|
||||||
compatible = "nvmem-cells";
|
nvmem-layout {
|
||||||
|
compatible = "fixed-layout";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
@ -174,18 +173,23 @@
|
|||||||
reg = <0x5000 0x2f20>;
|
reg = <0x5000 0x2f20>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
partition@60000 {
|
partition@60000 {
|
||||||
label = "info";
|
label = "info";
|
||||||
reg = <0x060000 0x020000>;
|
reg = <0x060000 0x020000>;
|
||||||
read-only;
|
read-only;
|
||||||
|
|
||||||
compatible = "nvmem-cells";
|
nvmem-layout {
|
||||||
|
compatible = "fixed-layout";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
macaddr_info_8: macaddr@8 {
|
macaddr_info_8: macaddr@8 {
|
||||||
|
compatible = "mac-base";
|
||||||
reg = <0x8 0x6>;
|
reg = <0x8 0x6>;
|
||||||
|
#nvmem-cell-cells = <1>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -234,6 +238,6 @@
|
|||||||
/* TODO: missing support in ath9k */
|
/* TODO: missing support in ath9k */
|
||||||
status = "disabled";
|
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";
|
nvmem-cell-names = "calibration", "mac-address";
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user