From b9ec173ffb88385079c801646a076a0489063364 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 3 Jun 2018 10:52:47 +0200
Subject: [PATCH] ipq40xx: add support for OpenMesh A62

This device is a dual 5GHz device. It is recommended to manually change the
radio of the first device to the lower 5GHz channels and the second radio
to the upper 5GHz channels.
---
 docs/index.rst                                              | 1 +
 package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac | 2 +-
 targets/ipq40xx                                             | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 76dc63faa..41a64ad72 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -305,6 +305,7 @@ ipq40xx
 * OpenMesh
 
   - A42 [#80211s]_
+  - A62 [#80211s]_
 
 * ZyXEL
 
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
index cbf7be2e1..353fa1562 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
@@ -45,7 +45,7 @@ elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c58-v1',
                                             'archer-c7'}) then
   table.insert(try_files, 1, '/sys/class/net/eth1/address')
 elseif platform.match('ipq40xx', nil, {'avm,fritzbox-4040',
-                                       'openmesh,a42'}) then
+                                       'openmesh,a42', 'openmesh,a62'}) then
   table.insert(try_files, 1, '/sys/class/net/eth0/address')
 end
 
diff --git a/targets/ipq40xx b/targets/ipq40xx
index 0fd84f50b..1ab2530d8 100644
--- a/targets/ipq40xx
+++ b/targets/ipq40xx
@@ -1,6 +1,8 @@
 ATH10K_PACKAGES_IPQ40XX=
+ATH10K_PACKAGES_QCA9888='ath10k-firmware-qca9888'
 if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then
 	ATH10K_PACKAGES_IPQ40XX='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca4019 ath10k-firmware-qca4019-ct'
+	ATH10K_PACKAGES_QCA9888='-ath10k-firmware-qca9888 ath10k-firmware-qca9888-ct'
 fi
 
 
@@ -35,6 +37,9 @@ packages $ATH10K_PACKAGES_IPQ40XX
 device openmesh-a42 openmesh_a42
 packages $ATH10K_PACKAGES_IPQ40XX
 
+device openmesh-a62 openmesh_a62
+packages $ATH10K_PACKAGES_IPQ40XX $ATH10K_PACKAGES_QCA9888
+
 
 # ZyXEL
 
-- 
GitLab