diff mbox series

[OpenWrt-Devel] ath79: add support for UniFi AC-LR

Message ID 20191006174834.3398181-1-dev@andreas-ziegler.de
State Accepted, archived
Delegated to: David Bauer
Headers show
Series [OpenWrt-Devel] ath79: add support for UniFi AC-LR | expand

Commit Message

Andreas Ziegler Oct. 6, 2019, 5:48 p.m. UTC 
The Unifi AC-LR has identical hardware to the Unifi AC-Lite.
The antenna setup is different according to the vendor,
which explains the thicker enclosure.
Therefore, it is helpful to know the exact device variant,
instead of having "Ubiquiti UniFi-AC-LITE/MESH".

Signed-off-by: Andreas Ziegler <dev@andreas-ziegler.de>
---
 target/linux/ath79/base-files/etc/board.d/02_network     | 1 +
 .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 1 +
 target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts       | 9 +++++++++
 target/linux/ath79/image/generic-ubnt.mk                 | 7 +++++++
 4 files changed, 18 insertions(+)
 create mode 100644 target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts

Comments

Adrian Schmutzler Oct. 14, 2019, 12:18 p.m. UTC | #1 
Hi,

the device name is inconsistent in model string and DEVICE_MODEL (hyphens...).

However, as this is only the friendly name, it is not really important.

On their homepage, Ubiquiti never uses hyphens on product names, only for the abbreviations:
UniFi AC Pro vs. UAP-AC-PRO-5
UniFi AC Lite vs. UAP-AC-LITE

Since we are using a lot of hyphens for other Ubiquiti devices, too, I wouldn't bother for this commit.
But it might make sense to "correct" the friendly names for all Ubiquiti devices at some point in the future.

Best

Adrian

> -----Original Message-----
> From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] On Behalf Of Andreas Ziegler
> Sent: Sonntag, 6. Oktober 2019 19:49
> To: openwrt-devel@lists.openwrt.org
> Subject: [OpenWrt-Devel] [PATCH] ath79: add support for UniFi AC-LR
> 
> The Unifi AC-LR has identical hardware to the Unifi AC-Lite.
> The antenna setup is different according to the vendor,
> which explains the thicker enclosure.
> Therefore, it is helpful to know the exact device variant,
> instead of having "Ubiquiti UniFi-AC-LITE/MESH".
> 
> Signed-off-by: Andreas Ziegler <dev@andreas-ziegler.de>
> ---
>  target/linux/ath79/base-files/etc/board.d/02_network     | 1 +
>  .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 1 +
>  target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts       | 9 +++++++++
>  target/linux/ath79/image/generic-ubnt.mk                 | 7 +++++++
>  4 files changed, 18 insertions(+)
>  create mode 100644 target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
> 
> 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 0de17adb9d..fe74bddbf1 100755
> --- a/target/linux/ath79/base-files/etc/board.d/02_network
> +++ b/target/linux/ath79/base-files/etc/board.d/02_network
> @@ -50,6 +50,7 @@ ath79_setup_interfaces()
>  	ubnt,nanostation-ac-loco|\
>  	ubnt,rocket-m|\
>  	ubnt,unifiac-lite|\
> +	ubnt,unifiac-lr|\
>  	ubnt,unifiac-mesh|\
>  	ubnt,unifi|\
>  	wd,mynet-wifi-rangeextender|\
> 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 446b729a2b..ba39cb3981 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
> @@ -179,6 +179,7 @@ case "$FIRMWARE" in
>  		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
>  		;;
>  	ubnt,unifiac-lite|\
> +	ubnt,unifiac-lr|\
>  	ubnt,unifiac-mesh|\
>  	ubnt,unifiac-mesh-pro|\
>  	ubnt,lap-120|\
> diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
> new file mode 100644
> index 0000000000..a1e542ada6
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
> @@ -0,0 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> +/dts-v1/;
> +
> +#include "qca9563_ubnt_unifiac-lite.dtsi"
> +
> +/ {
> +	compatible = "ubnt,unifiac-lr", "qca,qca9563";
> +	model = "Ubiquiti UniFi-AC-LR";
> +};
> diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
> index 4b2cee215c..13af092ee3 100644
> --- a/target/linux/ath79/image/generic-ubnt.mk
> +++ b/target/linux/ath79/image/generic-ubnt.mk
> @@ -225,6 +225,13 @@ define Device/ubnt_unifiac-lite
>  endef
>  TARGET_DEVICES += ubnt_unifiac-lite
> 
> +define Device/ubnt_unifiac-lr
> +  $(Device/ubnt_unifiac)
> +  DEVICE_MODEL := UniFi AC-LR
> +  SUPPORTED_DEVICES += unifiac-lite
> +endef
> +TARGET_DEVICES += ubnt_unifiac-lr
> +
>  define Device/ubnt_unifiac-mesh
>    $(Device/ubnt_unifiac)
>    DEVICE_MODEL := UniFi AC-Mesh
> --
> 2.23.0
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
David Bauer Oct. 14, 2019, 12:39 p.m. UTC | #2 
Hello Adrian,

On 10/14/19 2:18 PM, Adrian Schmutzler wrote:
> Hi,
> 
> the device name is inconsistent in model string and DEVICE_MODEL (hyphens...).
> 
> However, as this is only the friendly name, it is not really important.
> 
> On their homepage, Ubiquiti never uses hyphens on product names, only for the abbreviations:
> UniFi AC Pro vs. UAP-AC-PRO-5
> UniFi AC Lite vs. UAP-AC-LITE
> 
> Since we are using a lot of hyphens for other Ubiquiti devices, too, I wouldn't bother for this commit.
> But it might make sense to "correct" the friendly names for all Ubiquiti devices at some point in the future.

I've looked into the naming Ubiquiti uses for their devices and sadly, they have for
each of their devices multiple namings on their Website.

> UniFi AC Pro
> UniFi AP AC Pro
> UAP-AC-PRO

And don't get started on their Mesh series, things only get more confusing there.

If we want to be 100% consistent, we probably have to use the product-ids (UAP-AC-PRO for example),
however i think having the marketing name is nicer.

Best wishes
David

> 
> Best
> 
> Adrian
> 
>> -----Original Message-----
>> From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] On Behalf Of Andreas Ziegler
>> Sent: Sonntag, 6. Oktober 2019 19:49
>> To: openwrt-devel@lists.openwrt.org
>> Subject: [OpenWrt-Devel] [PATCH] ath79: add support for UniFi AC-LR
>>
>> The Unifi AC-LR has identical hardware to the Unifi AC-Lite.
>> The antenna setup is different according to the vendor,
>> which explains the thicker enclosure.
>> Therefore, it is helpful to know the exact device variant,
>> instead of having "Ubiquiti UniFi-AC-LITE/MESH".
>>
>> Signed-off-by: Andreas Ziegler <dev@andreas-ziegler.de>
>> ---
>>  target/linux/ath79/base-files/etc/board.d/02_network     | 1 +
>>  .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 1 +
>>  target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts       | 9 +++++++++
>>  target/linux/ath79/image/generic-ubnt.mk                 | 7 +++++++
>>  4 files changed, 18 insertions(+)
>>  create mode 100644 target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
>>
>> 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 0de17adb9d..fe74bddbf1 100755
>> --- a/target/linux/ath79/base-files/etc/board.d/02_network
>> +++ b/target/linux/ath79/base-files/etc/board.d/02_network
>> @@ -50,6 +50,7 @@ ath79_setup_interfaces()
>>  	ubnt,nanostation-ac-loco|\
>>  	ubnt,rocket-m|\
>>  	ubnt,unifiac-lite|\
>> +	ubnt,unifiac-lr|\
>>  	ubnt,unifiac-mesh|\
>>  	ubnt,unifi|\
>>  	wd,mynet-wifi-rangeextender|\
>> 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 446b729a2b..ba39cb3981 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
>> @@ -179,6 +179,7 @@ case "$FIRMWARE" in
>>  		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
>>  		;;
>>  	ubnt,unifiac-lite|\
>> +	ubnt,unifiac-lr|\
>>  	ubnt,unifiac-mesh|\
>>  	ubnt,unifiac-mesh-pro|\
>>  	ubnt,lap-120|\
>> diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
>> new file mode 100644
>> index 0000000000..a1e542ada6
>> --- /dev/null
>> +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
>> @@ -0,0 +1,9 @@
>> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
>> +/dts-v1/;
>> +
>> +#include "qca9563_ubnt_unifiac-lite.dtsi"
>> +
>> +/ {
>> +	compatible = "ubnt,unifiac-lr", "qca,qca9563";
>> +	model = "Ubiquiti UniFi-AC-LR";
>> +};
>> diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
>> index 4b2cee215c..13af092ee3 100644
>> --- a/target/linux/ath79/image/generic-ubnt.mk
>> +++ b/target/linux/ath79/image/generic-ubnt.mk
>> @@ -225,6 +225,13 @@ define Device/ubnt_unifiac-lite
>>  endef
>>  TARGET_DEVICES += ubnt_unifiac-lite
>>
>> +define Device/ubnt_unifiac-lr
>> +  $(Device/ubnt_unifiac)
>> +  DEVICE_MODEL := UniFi AC-LR
>> +  SUPPORTED_DEVICES += unifiac-lite
>> +endef
>> +TARGET_DEVICES += ubnt_unifiac-lr
>> +
>>  define Device/ubnt_unifiac-mesh
>>    $(Device/ubnt_unifiac)
>>    DEVICE_MODEL := UniFi AC-Mesh
>> --
>> 2.23.0
>>
>>
>> _______________________________________________
>> openwrt-devel mailing list
>> openwrt-devel@lists.openwrt.org
>> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Adrian Schmutzler Oct. 14, 2019, 12:45 p.m. UTC | #3 
Hi David,

> -----Original Message-----
> From: David Bauer [mailto:mail@david-bauer.net]
> Sent: Montag, 14. Oktober 2019 14:39
> To: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> Cc: dev@andreas-ziegler.de; openwrt-devel <openwrt-devel@lists.openwrt.org>
> Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for UniFi AC-LR
> 
> Hello Adrian,
> 
> On 10/14/19 2:18 PM, Adrian Schmutzler wrote:
> > Hi,
> >
> > the device name is inconsistent in model string and DEVICE_MODEL (hyphens...).
> >
> > However, as this is only the friendly name, it is not really important.
> >
> > On their homepage, Ubiquiti never uses hyphens on product names, only for the abbreviations:
> > UniFi AC Pro vs. UAP-AC-PRO-5
> > UniFi AC Lite vs. UAP-AC-LITE
> >
> > Since we are using a lot of hyphens for other Ubiquiti devices, too, I wouldn't bother for this commit.
> > But it might make sense to "correct" the friendly names for all Ubiquiti devices at some point in the future.
> 
> I've looked into the naming Ubiquiti uses for their devices and sadly, they have for
> each of their devices multiple namings on their Website.
> 
> > UniFi AC Pro
> > UniFi AP AC Pro
> > UAP-AC-PRO

Since we have the alternate names now, one could actually provide at least two, e.g.
DEVICE_MODEL := UniFi AC Pro
DEVICE_ALT0_MODEL := UAP-AC-PRO

I was mainly focusing on that we are using the names without hyphens originally and then add hyphens to them.

Nevertheless, I do not believe this is terribly important or blocks the LR support patch.
It's more like an objective for a boring, rainy afternoon.

Best

Adrian

> 
> And don't get started on their Mesh series, things only get more confusing there.
> 
> If we want to be 100% consistent, we probably have to use the product-ids (UAP-AC-PRO for example),
> however i think having the marketing name is nicer.
> 
> Best wishes
> David
> 
> >
> > Best
> >
> > Adrian
> >
> >> -----Original Message-----
> >> From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] On Behalf Of Andreas Ziegler
> >> Sent: Sonntag, 6. Oktober 2019 19:49
> >> To: openwrt-devel@lists.openwrt.org
> >> Subject: [OpenWrt-Devel] [PATCH] ath79: add support for UniFi AC-LR
> >>
> >> The Unifi AC-LR has identical hardware to the Unifi AC-Lite.
> >> The antenna setup is different according to the vendor,
> >> which explains the thicker enclosure.
> >> Therefore, it is helpful to know the exact device variant,
> >> instead of having "Ubiquiti UniFi-AC-LITE/MESH".
> >>
> >> Signed-off-by: Andreas Ziegler <dev@andreas-ziegler.de>
> >> ---
> >>  target/linux/ath79/base-files/etc/board.d/02_network     | 1 +
> >>  .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 1 +
> >>  target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts       | 9 +++++++++
> >>  target/linux/ath79/image/generic-ubnt.mk                 | 7 +++++++
> >>  4 files changed, 18 insertions(+)
> >>  create mode 100644 target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
> >>
> >> 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 0de17adb9d..fe74bddbf1 100755
> >> --- a/target/linux/ath79/base-files/etc/board.d/02_network
> >> +++ b/target/linux/ath79/base-files/etc/board.d/02_network
> >> @@ -50,6 +50,7 @@ ath79_setup_interfaces()
> >>  	ubnt,nanostation-ac-loco|\
> >>  	ubnt,rocket-m|\
> >>  	ubnt,unifiac-lite|\
> >> +	ubnt,unifiac-lr|\
> >>  	ubnt,unifiac-mesh|\
> >>  	ubnt,unifi|\
> >>  	wd,mynet-wifi-rangeextender|\
> >> 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 446b729a2b..ba39cb3981 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
> >> @@ -179,6 +179,7 @@ case "$FIRMWARE" in
> >>  		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
> >>  		;;
> >>  	ubnt,unifiac-lite|\
> >> +	ubnt,unifiac-lr|\
> >>  	ubnt,unifiac-mesh|\
> >>  	ubnt,unifiac-mesh-pro|\
> >>  	ubnt,lap-120|\
> >> diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
> >> new file mode 100644
> >> index 0000000000..a1e542ada6
> >> --- /dev/null
> >> +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
> >> @@ -0,0 +1,9 @@
> >> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> >> +/dts-v1/;
> >> +
> >> +#include "qca9563_ubnt_unifiac-lite.dtsi"
> >> +
> >> +/ {
> >> +	compatible = "ubnt,unifiac-lr", "qca,qca9563";
> >> +	model = "Ubiquiti UniFi-AC-LR";
> >> +};
> >> diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
> >> index 4b2cee215c..13af092ee3 100644
> >> --- a/target/linux/ath79/image/generic-ubnt.mk
> >> +++ b/target/linux/ath79/image/generic-ubnt.mk
> >> @@ -225,6 +225,13 @@ define Device/ubnt_unifiac-lite
> >>  endef
> >>  TARGET_DEVICES += ubnt_unifiac-lite
> >>
> >> +define Device/ubnt_unifiac-lr
> >> +  $(Device/ubnt_unifiac)
> >> +  DEVICE_MODEL := UniFi AC-LR
> >> +  SUPPORTED_DEVICES += unifiac-lite
> >> +endef
> >> +TARGET_DEVICES += ubnt_unifiac-lr
> >> +
> >>  define Device/ubnt_unifiac-mesh
> >>    $(Device/ubnt_unifiac)
> >>    DEVICE_MODEL := UniFi AC-Mesh
> >> --
> >> 2.23.0
> >>
> >>
> >> _______________________________________________
> >> openwrt-devel mailing list
> >> openwrt-devel@lists.openwrt.org
> >> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Andreas Ziegler Oct. 14, 2019, 9:03 p.m. UTC | #4 
Adrian Schmutzler schrieb am 14.10.19 um 14:18:
> Since we are using a lot of hyphens for other Ubiquiti devices, too, I wouldn't bother for this commit.

this was my only intention: keeping it consistent with already supported
unifi devices.
i don't mind anyone changing this before committing it.

Kind Regards
Andreas
diff mbox series

Patch

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 0de17adb9d..fe74bddbf1 100755
--- a/target/linux/ath79/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -50,6 +50,7 @@  ath79_setup_interfaces()
 	ubnt,nanostation-ac-loco|\
 	ubnt,rocket-m|\
 	ubnt,unifiac-lite|\
+	ubnt,unifiac-lr|\
 	ubnt,unifiac-mesh|\
 	ubnt,unifi|\
 	wd,mynet-wifi-rangeextender|\
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 446b729a2b..ba39cb3981 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
@@ -179,6 +179,7 @@  case "$FIRMWARE" in
 		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
 		;;
 	ubnt,unifiac-lite|\
+	ubnt,unifiac-lr|\
 	ubnt,unifiac-mesh|\
 	ubnt,unifiac-mesh-pro|\
 	ubnt,lap-120|\
diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
new file mode 100644
index 0000000000..a1e542ada6
--- /dev/null
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
@@ -0,0 +1,9 @@ 
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "qca9563_ubnt_unifiac-lite.dtsi"
+
+/ {
+	compatible = "ubnt,unifiac-lr", "qca,qca9563";
+	model = "Ubiquiti UniFi-AC-LR";
+};
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 4b2cee215c..13af092ee3 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -225,6 +225,13 @@  define Device/ubnt_unifiac-lite
 endef
 TARGET_DEVICES += ubnt_unifiac-lite
 
+define Device/ubnt_unifiac-lr
+  $(Device/ubnt_unifiac)
+  DEVICE_MODEL := UniFi AC-LR
+  SUPPORTED_DEVICES += unifiac-lite
+endef
+TARGET_DEVICES += ubnt_unifiac-lr
+
 define Device/ubnt_unifiac-mesh
   $(Device/ubnt_unifiac)
   DEVICE_MODEL := UniFi AC-Mesh