aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-22 19:28:17 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-22 19:28:17 +0100
commit1ae6292f75bc7faa525a08a3276540aaad8e11ca (patch)
tree96e3afaee807ba4cd3296793770eb7c7affa9bed
parent963f572ead0acb7460908d3c89307db64d831d3c (diff)
downloadupstream-1ae6292f75bc7faa525a08a3276540aaad8e11ca.tar.gz
upstream-1ae6292f75bc7faa525a08a3276540aaad8e11ca.tar.bz2
upstream-1ae6292f75bc7faa525a08a3276540aaad8e11ca.zip
ramips: move compatible for Ubiquiti Edgerouter X to DTS file
So far, the compatible for the Ubiquiti Edgerouter X has been defined in the DTSI file and inherited for the edgerouterx.dts, but overwritten for the edgerouterx-sfp.dts. In contrast, the model was stored in the DTS file in both cases. To resolve this somewhat confusing situation, move the compatible with the device name for edgerouterx to the DTS file as well. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts1
-rw-r--r--target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi2
2 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
index e78fdcf102..5c1d9ec887 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
+++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
@@ -4,4 +4,5 @@
/ {
model = "UBNT-ERX";
+ compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc";
};
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
index d8b4aa0a07..540ef10e2a 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
+++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
@@ -4,8 +4,6 @@
#include <dt-bindings/input/input.h>
/ {
- compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc";
-
aliases {
label-mac-device = &ethernet;
};