From 1ae6292f75bc7faa525a08a3276540aaad8e11ca Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 22 Feb 2020 19:28:17 +0100
Subject: [PATCH] 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>
---
target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts | 1 +
target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
index e78fdcf1023..5c1d9ec887c 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 d8b4aa0a073..540ef10e2a2 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 = ðernet;
};
--
GitLab