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>

diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
index e78fdcf1023bb0ff9f6f657999d8991c702aa302..5c1d9ec887cfa61f2372c2303aa432afbb143967 100644 (file)
--- 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 d8b4aa0a073ddfcaf29641afc13144f49e5eced8..540ef10e2a27167ce0b654bb0e05a080f2a9099d 100644 (file)
--- 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;
        };