From e420b7b5c517d03e1282b5889065e22143f9c4ef Mon Sep 17 00:00:00 2001 From: Christoph Krapp Date: Mon, 2 Jul 2018 14:39:54 +0200 Subject: [PATCH] ath79: add support for UniFi AC-Mesh Pro The Unifi AC-Mesh Pro has identical hardware to the Unifi AC-Pro except USB support. Furthermore for setting parameters like antenna gain it is helpful to know the exact device variant. Signed-off-by: Christoph Krapp --- .../ath79/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 1 + .../dts/qca9563_ubnt_unifiac-mesh-pro.dts | 9 +++++++ .../ath79/dts/qca9563_ubnt_unifiac-pro.dts | 25 ++----------------- .../ath79/dts/qca9563_ubnt_unifiac-pro.dtsi | 24 ++++++++++++++++++ target/linux/ath79/image/generic-ubnt.mk | 7 ++++++ 6 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 target/linux/ath79/dts/qca9563_ubnt_unifiac-mesh-pro.dts create mode 100644 target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index 10a1bbd9ec3a..dd75a55b7305 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -114,6 +114,7 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "3:lan:1" "5:lan:2" "4:wan" ;; + "ubnt,unifiac-mesh-pro"|\ "ubnt,unifiac-pro") ucidef_add_switch "switch0" \ "0@eth0" "2:lan" "3:wan" diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 28cfa25f4d19..240a1bf1dda2 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -101,6 +101,7 @@ case "$FIRMWARE" in ;; "ubnt,unifiac-lite"|\ "ubnt,unifiac-mesh"|\ + "ubnt,unifiac-mesh-pro"|\ "ubnt,unifiac-pro") ath10kcal_extract "EEPROM" 20480 2116 ;; diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-mesh-pro.dts b/target/linux/ath79/dts/qca9563_ubnt_unifiac-mesh-pro.dts new file mode 100644 index 000000000000..9d80217d4e94 --- /dev/null +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-mesh-pro.dts @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "qca9563_ubnt_unifiac-pro.dtsi" + +/ { + compatible = "ubnt,unifiac-mesh-pro", "qca,qca9563"; + model = "Ubiquiti UniFi-AC-MESH PRO"; +}; diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dts b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dts index 31ca0ab965a8..41449bbfc369 100644 --- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dts +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dts @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "qca9563_ubnt_unifiac.dtsi" +#include "qca9563_ubnt_unifiac-pro.dtsi" / { compatible = "ubnt,unifiac-pro", "qca,qca9563"; - model = "Ubiquiti UniFi-AC-PRO/MESH PRO"; + model = "Ubiquiti UniFi-AC-PRO"; }; &usb_phy0 { @@ -15,24 +15,3 @@ &usb0 { status = "okay"; }; - -&mdio0 { - status = "okay"; - phy-mask = <0>; - - phy0: ethernet-phy@0 { - reg = <0>; - phy-mode = "sgmii"; - qca,ar8327-initvals = < - 0x04 0x00080080 /* PORT0 PAD MODE CTRL */ - 0x7c 0x0000007e /* PORT0_STATUS */ - >; - }; -}; - -ð0 { - status = "okay"; - - mtd-mac-address = <&eeprom 0x0>; - phy-handle = <&phy0>; -}; diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi new file mode 100644 index 000000000000..f21814355028 --- /dev/null +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca9563_ubnt_unifiac.dtsi" + +&mdio0 { + status = "okay"; + phy-mask = <0>; + + phy0: ethernet-phy@0 { + reg = <0>; + phy-mode = "sgmii"; + qca,ar8327-initvals = < + 0x04 0x00080080 /* PORT0 PAD MODE CTRL */ + 0x7c 0x0000007e /* PORT0_STATUS */ + >; + }; +}; + +ð0 { + status = "okay"; + + mtd-mac-address = <&eeprom 0x0>; + phy-handle = <&phy0>; +}; diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 540277d41b88..4681996a7b2a 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -103,6 +103,13 @@ define Device/ubnt_unifiac-mesh endef TARGET_DEVICES += ubnt_unifiac-mesh +define Device/ubnt_unifiac-mesh-pro + $(Device/ubnt_unifiac) + DEVICE_TITLE := Ubiquiti UniFi AC-Mesh Pro + SUPPORTED_DEVICES += ubnt-unifiac-mesh-pro +endef +TARGET_DEVICES += ubnt_unifiac-mesh-pro + define Device/ubnt_unifiac-pro $(Device/ubnt_unifiac) DEVICE_TITLE := Ubiquiti UniFi AC-Pro -- 2.30.2