From 582ba9ddc789629a53969e5c66e19dfa183f2696 Mon Sep 17 00:00:00 2001 From: Roman Kuzmitskii Date: Tue, 6 Oct 2020 12:08:28 +0000 Subject: [PATCH] ath79: rename ubnt,acb-isp to ubnt,aircube-isp Use the full model name for this device to make it easier to recognize for the users and in order to make it consistent with the other devices. While at it, fix sorting in 03_gpio_switches. Signed-off-by: Roman Kuzmitskii [commit message facelift] Signed-off-by: Adrian Schmutzler --- ...ca9533_ubnt_acb-isp.dts => qca9533_ubnt_aircube-isp.dts} | 2 +- .../linux/ath79/generic/base-files/etc/board.d/02_network | 2 +- .../ath79/generic/base-files/etc/board.d/03_gpio_switches | 6 +++--- target/linux/ath79/image/generic-ubnt.mk | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) rename target/linux/ath79/dts/{qca9533_ubnt_acb-isp.dts => qca9533_ubnt_aircube-isp.dts} (96%) diff --git a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts similarity index 96% rename from target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts rename to target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts index 449e7fe451c..b74b0756fe9 100644 --- a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts +++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts @@ -6,7 +6,7 @@ #include / { - compatible = "ubnt,acb-isp", "qca,qca9533"; + compatible = "ubnt,aircube-isp", "qca,qca9533"; model = "Ubiquiti airCube ISP"; aliases { 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 bed817e286b..060c0c9e428 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -349,7 +349,7 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0" ;; - ubnt,acb-isp) + ubnt,aircube-isp) ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:3" "4:lan:2" diff --git a/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches b/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches index cf30bb405a2..d390fdfbe23 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches @@ -73,6 +73,9 @@ tplink,wbs510-v1|\ tplink,wbs510-v2) ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "20" ;; +ubnt,aircube-isp) + ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "11" + ;; ubnt,nanostation-ac) ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "3" ;; @@ -82,9 +85,6 @@ ubnt,nanostation-m) ubnt,nanostation-m-xw) ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "2" ;; -ubnt,acb-isp) - ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "11" - ;; zbtlink,zbt-wd323) ucidef_add_gpio_switch "io0" "IO#0" "0" ucidef_add_gpio_switch "io1" "IO#1" "1" diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 6939edd25de..cd67ea29041 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -110,7 +110,7 @@ define Device/ubnt-xw UBNT_VERSION := 6.0.4 endef -define Device/ubnt_acb-isp +define Device/ubnt_aircube-isp $(Device/ubnt) SOC := qca9533 DEVICE_MODEL := airCube ISP @@ -119,8 +119,9 @@ define Device/ubnt_acb-isp UBNT_CHIP := qca9533 UBNT_TYPE := ACB UBNT_VERSION := 2.5.0 + SUPPORTED_DEVICES += ubnt,acb-isp endef -TARGET_DEVICES += ubnt_acb-isp +TARGET_DEVICES += ubnt_aircube-isp define Device/ubnt_airrouter $(Device/ubnt-xm) -- 2.30.2