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>

target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts

@@ -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>;
-	};
-};

target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts

@@ -1,8 +0,0 @@
-/dts-v1/;
-
-#include "mt7621_ubiquiti_edgerouterx.dtsi"
-
-/ {
-	model = "UBNT-ERX";
-	compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc";
-};

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>;
+	};
+};

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";
+};

target/linux/ramips/image/mt7621.mk

@@ -794,27 +794,30 @@ define Device/tplink_re650-v1
 endef
 TARGET_DEVICES += tplink_re650-v1
 
-define Device/ubiquiti_edgerouterx
+define Device/ubnt_edgerouter_common
+  DEVICE_VENDOR := Ubiquiti
   IMAGE_SIZE := 256768k
   FILESYSTEMS := squashfs
   KERNEL_SIZE := 3145728
   KERNEL_INITRAMFS := $$(KERNEL) | \
 	ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  DEVICE_VENDOR := Ubiquiti
+endef
+
+define Device/ubnt_edgerouter-x
+  $(Device/ubnt_edgerouter_common)
   DEVICE_MODEL := EdgeRouter X
-  SUPPORTED_DEVICES += ubnt-erx
+  SUPPORTED_DEVICES += ubnt-erx ubiquiti,edgerouterx
 endef
-TARGET_DEVICES += ubiquiti_edgerouterx
+TARGET_DEVICES += ubnt_edgerouter-x
 
-define Device/ubiquiti_edgerouterx-sfp
+define Device/ubnt_edgerouter-x-sfp
-  $(Device/ubiquiti_edgerouterx)
+  $(Device/ubnt_edgerouter_common)
-  DEVICE_VENDOR := Ubiquiti
+  DEVICE_MODEL := EdgeRouter X SFP
-  DEVICE_MODEL := EdgeRouter X-SFP
   DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x
-  SUPPORTED_DEVICES += ubnt-erx-sfp
+  SUPPORTED_DEVICES += ubnt-erx-sfp ubiquiti,edgerouterx-sfp
 endef
-TARGET_DEVICES += ubiquiti_edgerouterx-sfp
+TARGET_DEVICES += ubnt_edgerouter-x-sfp
 
 define Device/ubnt_unifi-nanohd
   DEVICE_VENDOR := Ubiquiti

target/linux/ramips/mt7621/base-files/etc/board.d/02_network

@@ -42,8 +42,8 @@ ramips_setup_interfaces()
 	mikrotik,routerboard-750gr3)
 		ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan"
 		;;
-	ubiquiti,edgerouterx|\
+	ubnt,edgerouter-x|\
-	ubiquiti,edgerouterx-sfp)
+	ubnt,edgerouter-x-sfp)
 		ucidef_set_interface_lan "eth0 eth1 eth2 eth3 eth4"
 		;;
 	*)

target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches

@@ -13,10 +13,10 @@ mikrotik,routerboard-750gr3)
 telco-electronics,x1)
 	ucidef_add_gpio_switch "modem_reset" "Modem Reset" "16"
 	;;
-ubiquiti,edgerouterx)
+ubnt,edgerouter-x)
 	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "0"
 	;;
-ubiquiti,edgerouterx-sfp)
+ubnt,edgerouter-x-sfp)
 	ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "496"
 	ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "497"
 	ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "498"

target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master

@@ -7,8 +7,8 @@ mt7621_bringup_dsa_master() {
     local masterif
 
     case "$board" in
-    ubiquiti,edgerouterx|\
+    ubnt,edgerouter-x|\
-	ubiquiti,edgerouterx-sfp)
+    ubnt,edgerouter-x-sfp)
         masterif="dsa"
         ;;
     *)

target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh

@@ -62,8 +62,8 @@ platform_do_upgrade() {
 		iodata_mstc_upgrade_prepare
 		nand_do_upgrade "$1"
 		;;
-	ubiquiti,edgerouterx|\
+	ubnt,edgerouter-x|\
-	ubiquiti,edgerouterx-sfp)
+	ubnt,edgerouter-x-sfp)
 		platform_upgrade_ubnt_erx "$1"
 		;;
 	*)