aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/dts
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-07 10:47:18 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-12 13:25:42 +0200
commite8931b309f82a44b55e64af3668186cdf7bcde15 (patch)
tree756df8b4b54a73b2f4acd69ec48df19fe29b5410 /target/linux/ramips/dts
parentbebc9809d15b0ddc018d379f5caa3a11c9a06786 (diff)
downloadupstream-e8931b309f82a44b55e64af3668186cdf7bcde15.tar.gz
upstream-e8931b309f82a44b55e64af3668186cdf7bcde15.tar.bz2
upstream-e8931b309f82a44b55e64af3668186cdf7bcde15.zip
ramips: mt7621: tidy up names for Ubiquiti devices
The "proper" vendor prefix for Ubiquiti is "ubnt", this is used in all targets except ramips and also recommended by the kernel. This patch adjusts the various board/image/device name variables accordingly. Since we touch it anyway, this also adds the space in "EdgeRouter X" as a hyphen to those variables to really make them consistent with the model name. While at it, create a real shared definition for the devices in image/mt7621.mk instead of deriving one device from another. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ramips/dts')
-rw-r--r--target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts17
-rw-r--r--target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts8
-rw-r--r--target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts17
-rw-r--r--target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts8
-rw-r--r--target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi (renamed from target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi)0
5 files changed, 25 insertions, 25 deletions
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts
deleted file mode 100644
index b4deb490ed..0000000000
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-/dts-v1/;
-
-#include "mt7621_ubiquiti_edgerouterx.dtsi"
-
-/ {
- model = "UBNT-ERX-SFP";
- compatible = "ubiquiti,edgerouterx-sfp", "mediatek,mt7621-soc";
-};
-
-&i2c {
- status = "okay";
-
- pca9555@25 {
- compatible = "nxp,pca9555";
- reg = <0x25>;
- };
-};
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
deleted file mode 100644
index 5c1d9ec887..0000000000
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts
+++ /dev/null
@@ -1,8 +0,0 @@
-/dts-v1/;
-
-#include "mt7621_ubiquiti_edgerouterx.dtsi"
-
-/ {
- model = "UBNT-ERX";
- compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc";
-};
diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
new file mode 100644
index 0000000000..9515f1d8b5
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
@@ -0,0 +1,17 @@
+/dts-v1/;
+
+#include "mt7621_ubnt_edgerouter-x.dtsi"
+
+/ {
+ model = "Ubiquiti EdgeRouter X SFP";
+ compatible = "ubnt,edgerouter-x-sfp", "mediatek,mt7621-soc";
+};
+
+&i2c {
+ status = "okay";
+
+ pca9555@25 {
+ compatible = "nxp,pca9555";
+ reg = <0x25>;
+ };
+};
diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts
new file mode 100644
index 0000000000..260baf9cf9
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts
@@ -0,0 +1,8 @@
+/dts-v1/;
+
+#include "mt7621_ubnt_edgerouter-x.dtsi"
+
+/ {
+ model = "Ubiquiti EdgeRouter X";
+ compatible = "ubnt,edgerouter-x", "mediatek,mt7621-soc";
+};
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
index 4503f67a64..4503f67a64 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi