[PATCH 1/2] ath79: rename Ubiquiti powerbeam-m to powerbeam-m5

Russell Senior russell at personaltelco.net
Thu Aug 12 22:29:00 PDT 2021


The commit 12eb5b2384a6 added support for Ubiquiti PowerBeam M (XW), tested
on the PBE-M5-400. But, it turns out the PBE-M2-400 has a different ethernet
configuration, so make the support specific to the m5 version in anticipation
of adding specific support for the m2 in a separate commit.

Signed-off-by: Russell Senior <russell at personaltelco.net>
---
 ...t_powerbeam-m-xw.dts => ar9342_ubnt_powerbeam-m5-xw.dts} | 2 +-
 target/linux/ath79/generic/base-files/etc/board.d/01_leds   | 2 +-
 .../linux/ath79/generic/base-files/etc/board.d/02_network   | 2 +-
 target/linux/ath79/image/generic-ubnt.mk                    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename target/linux/ath79/dts/{ar9342_ubnt_powerbeam-m-xw.dts => ar9342_ubnt_powerbeam-m5-xw.dts} (88%)

diff --git a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-m-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-m5-xw.dts
similarity index 88%
rename from target/linux/ath79/dts/ar9342_ubnt_powerbeam-m-xw.dts
rename to target/linux/ath79/dts/ar9342_ubnt_powerbeam-m5-xw.dts
index 6db058f887..09494ad538 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-m-xw.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-m5-xw.dts
@@ -3,7 +3,7 @@
 #include "ar9342_ubnt_xw.dtsi"
 
 / {
-	compatible = "ubnt,powerbeam-m-xw", "ubnt,xw", "qca,ar9342";
+	compatible = "ubnt,powerbeam-m5-xw", "ubnt,xw", "qca,ar9342";
 	model = "Ubiquiti PowerBeam M (XW)";
 };
 
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
index 7a07b0ce6d..5707bbac4e 100644
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -406,7 +406,7 @@ ubnt,nanostation-loco-m-xw|\
 ubnt,nanostation-m|\
 ubnt,nanostation-m-xw|\
 ubnt,picostation-m|\
-ubnt,powerbeam-m-xw|\
+ubnt,powerbeam-m5-xw|\
 ubnt,powerbridge-m|\
 ubnt,rocket-m)
 	ucidef_set_rssimon "wlan0" "200000" "1"
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 4fe7fbc027..780068790c 100644
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -86,7 +86,7 @@ ath79_setup_interfaces()
 	ubnt,picostation-m|\
 	ubnt,powerbeam-5ac-500|\
 	ubnt,powerbeam-5ac-gen2|\
-	ubnt,powerbeam-m-xw|\
+	ubnt,powerbeam-m5-xw|\
 	ubnt,powerbridge-m|\
 	ubnt,rocket-5ac-lite|\
 	ubnt,rocket-m|\
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 01e8533fd6..547af632f6 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -328,13 +328,13 @@ define Device/ubnt_powerbeam-5ac-gen2
 endef
 TARGET_DEVICES += ubnt_powerbeam-5ac-gen2
 
-define Device/ubnt_powerbeam-m-xw
+define Device/ubnt_powerbeam-m5-xw
   $(Device/ubnt-xw)
-  DEVICE_MODEL := PowerBeam M
+  DEVICE_MODEL := PowerBeam M5
   DEVICE_PACKAGES += rssileds
   SUPPORTED_DEVICES += loco-m-xw
 endef
-TARGET_DEVICES += ubnt_powerbeam-m-xw
+TARGET_DEVICES += ubnt_powerbeam-m5-xw
 
 define Device/ubnt_powerbridge-m
   $(Device/ubnt-xm)
-- 
2.32.0




More information about the openwrt-devel mailing list