Due to use of a script when migrating from mtd-mac-address, a few
of the definitions are redundant in DTSI and DTS files. Remove
those and consolidate the definitions in parent DTSI files in a
few cases.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
20 files changed:
&ath9k {
compatible = "pci168c,002a";
};
&ath9k {
compatible = "pci168c,002a";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr@1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
&ath9k {
compatible = "pci168c,002b";
};
&ath9k {
compatible = "pci168c,002b";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr@1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
phy-mode = "rgmii-rxid";
pll-data = <0x16000000 0x00000101 0x00001313>;
phy-mode = "rgmii-rxid";
pll-data = <0x16000000 0x00000101 0x00001313>;
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
fixed-link {
speed = <1000>;
full-duplex;
fixed-link {
speed = <1000>;
full-duplex;
qca,disable-5ghz;
mtd-cal-data = <&art 0x1000>;
};
qca,disable-5ghz;
mtd-cal-data = <&art 0x1000>;
};
+
+&art {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_art_0: macaddr@0 {
+ reg = <0x0 0x6>;
+ };
+};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
pinctrl-single,bits = <0x0 0x002e0000 0x00ff0000>;
};
};
pinctrl-single,bits = <0x0 0x002e0000 0x00ff0000>;
};
};
-
-&config {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_config_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
-
-&config {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_config_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
switch-only-mode = <1>;
};
};
switch-only-mode = <1>;
};
};
-
-&info {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_info_8: macaddr@8 {
- reg = <0x8 0x6>;
- };
-};
switch-only-mode = <1>;
};
};
switch-only-mode = <1>;
};
};
-
-&info {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_info_8: macaddr@8 {
- reg = <0x8 0x6>;
- };
-};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
mac-address-increment = <16>;
};
};
mac-address-increment = <16>;
};
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
mac-address-increment = <16>;
};
};
mac-address-increment = <16>;
};
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
pll-data = <0x03000000 0x00000101 0x00001313>;
};
pll-data = <0x03000000 0x00000101 0x00001313>;
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
nvmem-cell-names = "mac-address";
phy-handle = <&phy0>;
};
nvmem-cell-names = "mac-address";
phy-handle = <&phy0>;
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
mtd-cal-data = <&art 0x1000>;
};
mtd-cal-data = <&art 0x1000>;
};
+
+&art {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_art_0: macaddr@0 {
+ reg = <0x0 0x6>;
+ };
+};
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr@1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr@1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr@1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};