aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-27 15:36:32 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-31 13:42:12 +0100
commit6c407fb5db02bc54de2098563c584509bec44432 (patch)
treef2e207e588615b326307eac0e2f2a5566079c907 /target/linux
parentc8190713cb69063db13c89f4041c71dc6c7b20d9 (diff)
downloadupstream-6c407fb5db02bc54de2098563c584509bec44432.tar.gz
upstream-6c407fb5db02bc54de2098563c584509bec44432.tar.bz2
upstream-6c407fb5db02bc54de2098563c584509bec44432.zip
ath79: do not set inherited phy-mode/status properties again
There are several cases where phy-mode and status properties are set again in DTS(I) files although those were set to the same values in parent DTSI files already. Remove those cases (and thus also stop their proliferation by copy/paste). Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ath79/dts/ar7240.dtsi1
-rw-r--r--target/linux/ath79/dts/ar7241.dtsi1
-rw-r--r--target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts1
-rw-r--r--target/linux/ath79/dts/ar9330.dtsi1
-rw-r--r--target/linux/ath79/dts/ar9341.dtsi4
-rw-r--r--target/linux/ath79/dts/ar9341_pcs_cr3000.dts6
-rw-r--r--target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts1
-rw-r--r--target/linux/ath79/dts/qca953x.dtsi2
-rw-r--r--target/linux/ath79/dts/qca9561_avm_fritz4020.dts1
-rw-r--r--target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts1
-rw-r--r--target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi1
-rw-r--r--target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi1
-rw-r--r--target/linux/ath79/dts/qca956x.dtsi2
-rw-r--r--target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi1
14 files changed, 2 insertions, 22 deletions
diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 268c8780f4a..5382a710f94 100644
--- a/target/linux/ath79/dts/ar7240.dtsi
+++ b/target/linux/ath79/dts/ar7240.dtsi
@@ -65,7 +65,6 @@
resets = <&rst 9>;
reset-names = "mac";
- phy-mode = "mii";
phy-handle = <&swphy4>;
};
diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi
index 8f0eb3b270a..59fcd05f5ea 100644
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -46,7 +46,6 @@
resets = <&rst 9>;
reset-names = "mac";
- phy-mode = "mii";
phy-handle = <&swphy4>;
};
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
index 3e6dd2daea6..e55affdf203 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
@@ -119,7 +119,6 @@
&eth0 {
status = "okay";
- phy-mode = "mii";
mtd-mac-address = <&uboot 0x1fc00>;
phy-handle = <&phy12>;
diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 64c135405b9..042b70e0bb4 100644
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -170,7 +170,6 @@
resets = <&rst 9>;
reset-names = "mac";
- phy-mode = "mii";
phy-handle = <&swphy4>;
};
diff --git a/target/linux/ath79/dts/ar9341.dtsi b/target/linux/ath79/dts/ar9341.dtsi
index a7c5ac6262f..10161f32ac4 100644
--- a/target/linux/ath79/dts/ar9341.dtsi
+++ b/target/linux/ath79/dts/ar9341.dtsi
@@ -17,10 +17,6 @@
interrupts = <2>;
};
-&eth0 {
- phy-mode = "mii";
-};
-
&eth1 {
status = "okay";
};
diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index 222516f9b79..272b0909b5b 100644
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -150,13 +150,11 @@
};
&eth1 {
- status = "okay";
-
phy-handle = <&swphy4>;
- mtd-mac-address = <&art 0x0>;
- phy-mode = "gmii";
pll-data = <0x06000000 0x00000101 0x00001616>;
+ mtd-mac-address = <&art 0x0>;
+
gmac-config {
device = <&gmac>;
switch-phy-swap = <1>;
diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts
index eac2a4268a9..7ca61fe27a5 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts
@@ -26,7 +26,6 @@
&eth0 {
status = "okay";
- phy-mode = "mii";
phy-handle = <&phy0>;
gmac-config {
diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index f127d4d01b2..73a6ad91e5f 100644
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -231,8 +231,6 @@
reset-names = "mac";
resets = <&rst 9>;
-
- phy-mode = "mii";
};
&mdio1 {
diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
index 64122525907..75cc5761ba7 100644
--- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
+++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
@@ -153,7 +153,6 @@
&eth0 {
status = "okay";
- phy-mode = "mii";
phy-handle = <&swphy0>;
gmac-config {
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index f894fc86729..e7b30df81f0 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -181,7 +181,6 @@
&eth0 {
status = "okay";
- phy-mode = "mii";
phy-handle = <&swphy4>;
mtd-mac-address = <&info 0x8>;
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
index 00cd413bd27..c8e4710b39a 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -136,7 +136,6 @@
&eth0 {
status = "okay";
- phy-mode = "mii";
phy-handle = <&swphy0>;
mtd-mac-address = <&mac 0x8>;
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
index cee30a13b68..9b51ebf6892 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
@@ -88,7 +88,6 @@
&eth0 {
status = "okay";
- phy-mode = "mii";
phy-handle = <&swphy4>;
mtd-mac-address = <&mac 0x8>;
diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index ee645aa02f0..03541b86fbe 100644
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -307,8 +307,6 @@
resets = <&rst 13>;
reset-names = "mac";
- status = "disabled";
-
fixed-link {
speed = <1000>;
full-duplex;
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
index fb5941657df..aeb55253089 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi
@@ -73,7 +73,6 @@
&eth0 {
status = "okay";
- phy-mode = "mii";
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;