From: Roman Kuzmitskii Date: Tue, 6 Oct 2020 12:08:28 +0000 (+0000) Subject: ath79: rename ubnt,acb-isp to ubnt,aircube-isp X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=582ba9ddc789629a53969e5c66e19dfa183f2696;p=openwrt%2Fstaging%2Frobimarko.git 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 --- diff --git a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts deleted file mode 100644 index 449e7fe451..0000000000 --- a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts +++ /dev/null @@ -1,98 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qca953x.dtsi" - -#include -#include - -/ { - compatible = "ubnt,acb-isp", "qca,qca9533"; - model = "Ubiquiti airCube ISP"; - - aliases { - label-mac-device = &wmac; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - linux,code = ; - gpios = <&gpio 17 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; - }; -}; - -&spi { - status = "okay"; - num-cs = <1>; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x000000 0x040000>; - read-only; - }; - - partition@40000 { - label = "u-boot-env"; - reg = <0x040000 0x010000>; - read-only; - }; - - partition@50000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x050000 0xf60000>; - }; - - partition@fb0000 { - label = "cfg"; - reg = <0xfb0000 0x040000>; - read-only; - }; - - art: partition@ff0000 { - label = "art"; - reg = <0xff0000 0x010000>; - read-only; - }; - }; - }; -}; - -&uart { - status = "okay"; -}; - -ð0 { - status = "okay"; - - phy-handle = <&swphy4>; - - mtd-mac-address = <&art 0x0>; -}; - -ð1 { - mtd-mac-address = <&art 0x6>; - - gmac-config { - device = <&gmac>; - }; -}; - -&wmac { - status = "okay"; - mtd-cal-data = <&art 0x1000>; -}; diff --git a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts new file mode 100644 index 0000000000..b74b0756fe --- /dev/null +++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca953x.dtsi" + +#include +#include + +/ { + compatible = "ubnt,aircube-isp", "qca,qca9533"; + model = "Ubiquiti airCube ISP"; + + aliases { + label-mac-device = &wmac; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; +}; + +&spi { + status = "okay"; + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x040000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x040000 0x010000>; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x050000 0xf60000>; + }; + + partition@fb0000 { + label = "cfg"; + reg = <0xfb0000 0x040000>; + read-only; + }; + + art: partition@ff0000 { + label = "art"; + reg = <0xff0000 0x010000>; + read-only; + }; + }; + }; +}; + +&uart { + status = "okay"; +}; + +ð0 { + status = "okay"; + + phy-handle = <&swphy4>; + + mtd-mac-address = <&art 0x0>; +}; + +ð1 { + mtd-mac-address = <&art 0x6>; + + gmac-config { + device = <&gmac>; + }; +}; + +&wmac { + status = "okay"; + mtd-cal-data = <&art 0x1000>; +}; 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 bed817e286..060c0c9e42 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 cf30bb405a..d390fdfbe2 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 6939edd25d..cd67ea2904 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)