[openwrt/openwrt] ath79: remove redundant nvmem definitions
LEDE Commits
lede-commits at lists.infradead.org
Fri Aug 20 09:14:16 PDT 2021
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/41aa765946c55a91543cc872f595f5e3298dcf0a
commit 41aa765946c55a91543cc872f595f5e3298dcf0a
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Fri Aug 20 00:09:58 2021 +0200
ath79: remove redundant nvmem definitions
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 at adrianschmutzler.de>
---
target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi | 10 ----------
target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi | 10 ----------
target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts | 4 ++--
target/linux/ath79/dts/ar9342_ubnt_wa.dtsi | 10 ++++++++++
target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi | 10 ----------
target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi | 10 ----------
target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts | 10 ----------
target/linux/ath79/dts/ar9344_teltonika_rut955.dts | 10 ----------
target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi | 10 ----------
target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts | 10 ----------
target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts | 10 ----------
target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts | 10 ----------
target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts | 10 ----------
target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts | 10 ----------
target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi | 10 ----------
target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi | 10 ----------
target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 10 ++++++++++
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi | 10 ----------
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts | 10 ----------
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts | 10 ----------
20 files changed, 22 insertions(+), 172 deletions(-)
diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
index ceb6b1d7a2..2bded28ea4 100644
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
@@ -21,13 +21,3 @@
&ath9k {
compatible = "pci168c,002a";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr at 1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
index 40a2ca2399..9d896360dc 100644
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
@@ -44,13 +44,3 @@
&ath9k {
compatible = "pci168c,002b";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr at 1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
index ec17d59d1a..f5433a30a3 100644
--- a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
+++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
@@ -169,7 +169,6 @@
full-duplex;
};
};
-
};
};
};
@@ -177,12 +176,13 @@
ð0 {
status = "okay";
+ phy-handle = <&phy0>;
phy-mode = "rgmii-rxid";
pll-data = <0x16000000 0x00000101 0x00001313>;
+
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
- phy-handle = <&phy0>;
fixed-link {
speed = <1000>;
full-duplex;
diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
index ac036ccd85..549daace7e 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
@@ -81,3 +81,13 @@
qca,disable-5ghz;
mtd-cal-data = <&art 0x1000>;
};
+
+&art {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_art_0: macaddr at 0 {
+ reg = <0x0 0x6>;
+ };
+};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi
index bd6feb3d78..045cbe8985 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi
@@ -30,13 +30,3 @@
rxdv-delay = <3>;
};
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi
index 5024a140f3..2567c77759 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi
@@ -38,13 +38,3 @@
rxdv-delay = <2>;
};
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
index e017ae2308..2cb8d4015c 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
@@ -192,13 +192,3 @@
pinctrl-single,bits = <0x0 0x002e0000 0x00ff0000>;
};
};
-
-&config {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_config_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
index 56821fccde..7a1f05afcc 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
@@ -188,13 +188,3 @@
<0x14 0x08 0xff>;
};
};
-
-&config {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_config_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
index d539d2e0a6..e35fa486e4 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
@@ -54,13 +54,3 @@
switch-only-mode = <1>;
};
};
-
-&info {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_info_8: macaddr at 8 {
- reg = <0x8 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
index fb31aa2872..920d2db996 100644
--- a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
@@ -29,13 +29,3 @@
switch-only-mode = <1>;
};
};
-
-&info {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_info_8: macaddr at 8 {
- reg = <0x8 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
index d078df1989..af305f8f07 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
@@ -67,13 +67,3 @@
qca955x-sgmii-fixup;
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
index d60e7c4857..6202ff3799 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
@@ -102,13 +102,3 @@
qca955x-sgmii-fixup;
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
index ff33a075f5..211255cdde 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
@@ -24,13 +24,3 @@
mac-address-increment = <16>;
};
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
index 12ebb67ba6..0d29c5cf06 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
@@ -24,13 +24,3 @@
mac-address-increment = <16>;
};
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
index d2797086f4..5eb358014b 100644
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
@@ -28,13 +28,3 @@
pll-data = <0x03000000 0x00000101 0x00001313>;
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
index f3dc068605..dbf6c27146 100644
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
@@ -29,13 +29,3 @@
nvmem-cell-names = "mac-address";
phy-handle = <&phy0>;
};
-
-&art {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_art_0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index 42fe25c781..2e407c3486 100644
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -105,3 +105,13 @@
mtd-cal-data = <&art 0x1000>;
};
+
+&art {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_art_0: macaddr at 0 {
+ reg = <0x0 0x6>;
+ };
+};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
index 416623fec4..b2c009c346 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
@@ -67,13 +67,3 @@
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr at 1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
index 35facbdade..daf7779314 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
@@ -69,13 +69,3 @@
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr at 1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
index 1bc3b0ae90..409f288f07 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
@@ -33,13 +33,3 @@
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
-
-&uboot {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_uboot_1fc00: macaddr at 1fc00 {
- reg = <0x1fc00 0x6>;
- };
-};
More information about the lede-commits
mailing list