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 <damex.pp@icloud.com>
[commit message facelift]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Roman Kuzmitskii 2020-10-06 12:08:28 +00:00 committed by Adrian Schmutzler
parent e5f7a9889c
commit 582ba9ddc7
4 changed files with 8 additions and 7 deletions

View File

@ -6,7 +6,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "ubnt,acb-isp", "qca,qca9533"; compatible = "ubnt,aircube-isp", "qca,qca9533";
model = "Ubiquiti airCube ISP"; model = "Ubiquiti airCube ISP";
aliases { aliases {

View File

@ -349,7 +349,7 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
;; ;;
ubnt,acb-isp) ubnt,aircube-isp)
ucidef_set_interface_wan "eth1" ucidef_set_interface_wan "eth1"
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth0" "2:lan:1" "3:lan:3" "4:lan:2" "0@eth0" "2:lan:1" "3:lan:3" "4:lan:2"

View File

@ -73,6 +73,9 @@ tplink,wbs510-v1|\
tplink,wbs510-v2) tplink,wbs510-v2)
ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "20" ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "20"
;; ;;
ubnt,aircube-isp)
ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "11"
;;
ubnt,nanostation-ac) ubnt,nanostation-ac)
ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "3" ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "3"
;; ;;
@ -82,9 +85,6 @@ ubnt,nanostation-m)
ubnt,nanostation-m-xw) ubnt,nanostation-m-xw)
ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "2" ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
;; ;;
ubnt,acb-isp)
ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "11"
;;
zbtlink,zbt-wd323) zbtlink,zbt-wd323)
ucidef_add_gpio_switch "io0" "IO#0" "0" ucidef_add_gpio_switch "io0" "IO#0" "0"
ucidef_add_gpio_switch "io1" "IO#1" "1" ucidef_add_gpio_switch "io1" "IO#1" "1"

View File

@ -110,7 +110,7 @@ define Device/ubnt-xw
UBNT_VERSION := 6.0.4 UBNT_VERSION := 6.0.4
endef endef
define Device/ubnt_acb-isp define Device/ubnt_aircube-isp
$(Device/ubnt) $(Device/ubnt)
SOC := qca9533 SOC := qca9533
DEVICE_MODEL := airCube ISP DEVICE_MODEL := airCube ISP
@ -119,8 +119,9 @@ define Device/ubnt_acb-isp
UBNT_CHIP := qca9533 UBNT_CHIP := qca9533
UBNT_TYPE := ACB UBNT_TYPE := ACB
UBNT_VERSION := 2.5.0 UBNT_VERSION := 2.5.0
SUPPORTED_DEVICES += ubnt,acb-isp
endef endef
TARGET_DEVICES += ubnt_acb-isp TARGET_DEVICES += ubnt_aircube-isp
define Device/ubnt_airrouter define Device/ubnt_airrouter
$(Device/ubnt-xm) $(Device/ubnt-xm)