diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 181670ad78d4c578e1da7139724e72b02bece908..24ea09c3f35520a10db2d3e261fbf7fff0f91066 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -35,6 +35,7 @@ ath79-generic
* OpenMesh
+ - A40
- A60
* Plasma Cloud
diff --git a/patches/openwrt/0006-ath79-Add-support-for-OpenMesh-A40.patch b/patches/openwrt/0006-ath79-Add-support-for-OpenMesh-A40.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3b22780f3d51d4b730cad12c5ea665ab30bcaa99
--- /dev/null
+++ b/patches/openwrt/0006-ath79-Add-support-for-OpenMesh-A40.patch
@@ -0,0 +1,151 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Mon, 23 Nov 2020 13:41:34 +0100
+Subject: ath79: Add support for OpenMesh A40
+
+Device specifications:
+======================
+
+* Qualcomm/Atheros QCA9558 ver 1 rev 0
+* 720/600/240 MHz (CPU/DDR/AHB)
+* 128 MB of RAM
+* 16 MB of SPI NOR flash
+ - 2x 7 MB available; but one of the 7 MB regions is the recovery image
+* 2T2R 2.4 GHz Wi-Fi (11n)
+* 2T2R 5 GHz Wi-Fi (11ac)
+* multi-color LED (controlled via red/green/blue GPIOs)
+* 1x GPIO-button (reset)
+* external h/w watchdog (enabled by default))
+* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX)
+* 2x ethernet
+ - eth0
+ + Label: Ethernet 1
+ + AR8035 ethernet PHY (RGMII)
+ + 10/100/1000 Mbps Ethernet
+ + 802.3af POE
+ + used as WAN interface
+ - eth1
+ + Label: Ethernet 2
+ + AR8035 ethernet PHY (SGMII)
+ + 10/100/1000 Mbps Ethernet
+ + used as LAN interface
+* 1x USB
+* internal antennas
+
+Flashing instructions:
+======================
+
+Various methods can be used to install the actual image on the flash.
+Two easy ones are:
+
+ap51-flash
+----------
+
+The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be
+used to transfer the image to the u-boot when the device boots up.
+
+initramfs from TFTP
+-------------------
+
+The serial console must be used to access the u-boot shell during bootup.
+It can then be used to first boot up the initramfs image from a TFTP server
+(here with the IP 192.168.1.21):
+
+ setenv serverip 192.168.1.21
+ setenv ipaddr 192.168.1.1
+ tftpboot 0c00000 <filename-of-initramfs-kernel>.bin && bootm $fileaddr
+
+The actual sysupgrade image can then be transferred (on the LAN port) to the
+device via
+
+ scp <filename-of-squashfs-sysupgrade>.bin root@192.168.1.1:/tmp/
+
+On the device, the sysupgrade must then be started using
+
+ sysupgrade -n /tmp/<filename-of-squashfs-sysupgrade>.bin
+
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+(cherry picked from commit 9a172797e593c061f6759a37eaeba2956ad8d72f)
+
+diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
+index 0791d58b04cd108fcd2190bcf3c39f715f0b511f..a37057953bc1e9b7fdf2be02136142d0fc145054 100644
+--- a/package/boot/uboot-envtools/files/ath79
++++ b/package/boot/uboot-envtools/files/ath79
+@@ -49,6 +49,7 @@ netgear,wnr2200-16m|\
+ netgear,wnr612-v2|\
+ ocedo,koala|\
+ ocedo,raccoon|\
++openmesh,a40|\
+ openmesh,a60|\
+ openmesh,mr600-v1|\
+ openmesh,mr600-v2|\
+diff --git a/target/linux/ath79/dts/qca9558_openmesh_a40.dts b/target/linux/ath79/dts/qca9558_openmesh_a40.dts
+new file mode 100644
+index 0000000000000000000000000000000000000000..d2b817031a9db6846de0632a64962a0197fa2c6f
+--- /dev/null
++++ b/target/linux/ath79/dts/qca9558_openmesh_a40.dts
+@@ -0,0 +1,8 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
++#include "qca9558_openmesh_a60.dtsi"
++
++/ {
++ compatible = "openmesh,a40", "qca,qca9558";
++ model = "OpenMesh A40";
++};
+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 4b83ac7d32fc372cd3b493e8ec427c04e0f2e0d1..c2932c1737d97f3eb732620041664f5060d16946 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
+@@ -172,6 +172,7 @@ ath79_setup_interfaces()
+ comfast,cf-e120a-v3|\
+ comfast,cf-e314n-v2|\
+ compex,wpj531-16m|\
++ openmesh,a40|\
+ openmesh,a60|\
+ openmesh,om2p-v4|\
+ openmesh,om2p-hs-v4|\
+diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+index b4c8a78a7fe4ba5bd3ca1f9c6e2b5e51e7fd1882..b70a87054b10fbe708d9aa8603ecdb591fc92591 100644
+--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
++++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+@@ -99,6 +99,7 @@ case "$FIRMWARE" in
+ caldata_extract "art" 0x5000 0x844
+ ath10k_patch_mac $(mtd_get_mac_binary art 0xc)
+ ;;
++ openmesh,a40|\
+ openmesh,a60|\
+ openmesh,mr1750-v1|\
+ openmesh,mr1750-v2|\
+diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
+index f7862bb032fbce56be77e9db8ae2e37bf5da30ea..e979c11bb91cb20fd4168b8921499f03572d3512 100644
+--- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
+@@ -65,6 +65,7 @@ platform_do_upgrade() {
+ jjplus,ja76pf2)
+ redboot_fis_do_upgrade "$1" linux
+ ;;
++ openmesh,a40|\
+ openmesh,a60|\
+ openmesh,mr600-v1|\
+ openmesh,mr600-v2|\
+diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
+index c669eb2cdb3f868c320412801723ceb112b4089f..c63900dc701bbc21dce12086f7045d7d450fc5f3 100644
+--- a/target/linux/ath79/image/generic.mk
++++ b/target/linux/ath79/image/generic.mk
+@@ -1640,6 +1640,16 @@ define Device/openmesh_common_256k
+ openmesh-image ce_type=$$$$(OPENMESH_CE_TYPE) | append-metadata
+ endef
+
++define Device/openmesh_a40
++ $(Device/openmesh_common_64k)
++ SOC := qca9558
++ DEVICE_MODEL := A40
++ DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2
++ OPENMESH_CE_TYPE := A60
++ SUPPORTED_DEVICES += a40
++endef
++TARGET_DEVICES += openmesh_a40
++
+ define Device/openmesh_a60
+ $(Device/openmesh_common_64k)
+ SOC := qca9558
diff --git a/targets/ath79-generic b/targets/ath79-generic
index 03329254d9a708abb5c892e07099c905920e8db3..70ec2942fc8cb15e4d86d60482352a4c03fb14af 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -91,6 +91,11 @@ device('onion-omega', 'onion_omega')
-- OpenMesh
+device('openmesh-a40', 'openmesh_a40', {
+ packages = ATH10K_PACKAGES_QCA9880,
+ factory = false,
+})
+
device('openmesh-a60', 'openmesh_a60', {
packages = ATH10K_PACKAGES_QCA9880,
factory = false,