diff mbox series

add ath11k MODULE_FIRMWARE macros

Message ID 20201202182705.dhkml4nb4rf2vwav@orac (mailing list archive)
State Accepted
Commit 3dbd7fe78c42e54a039d3444eac2183aa03f1408
Delegated to: Kalle Valo
Headers show
Series add ath11k MODULE_FIRMWARE macros | expand

Commit Message

Devin Bayer Dec. 2, 2020, 6:27 p.m. UTC
Hello,

I am trying to get the ath11k driver to work with VyOS and during the
build it tries to discover the firmware blobs which drivers require.

This doesn't work with ath11k because it doesn't use the MODULE_FIRMWARE
macro. This patch fixes that.

Thanks,
Devin

Signed-off-by: Devin Bayer <dev@doubly.so>
---
 drivers/net/wireless/ath/ath11k/core.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Kalle Valo Dec. 7, 2020, 4:22 p.m. UTC | #1
Devin Bayer <dev@doubly.so> wrote:

> I am trying to get the ath11k driver to work with VyOS and during the
> build it tries to discover the firmware blobs which drivers require.
> 
> This doesn't work with ath11k because it doesn't use the MODULE_FIRMWARE
> macro. This patch fixes that.
> 
> Signed-off-by: Devin Bayer <dev@doubly.so>
> [kvalo@codeaurora.org: cleanup commit log, move to pci.c]
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

I cleaned up the commit log and moved the macros to pci.c, please check my changes:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=9fc43fa2b621fa84a312d9eba538bf75c9049f3b
Kalle Valo Dec. 8, 2020, 7:45 a.m. UTC | #2
Devin Bayer <dev@doubly.so> wrote:

> I am trying to get the ath11k driver to work with VyOS and during the
> build it tries to discover the firmware blobs which drivers require.
> 
> This doesn't work with ath11k because it doesn't use the MODULE_FIRMWARE
> macro. This patch fixes that.
> 
> Signed-off-by: Devin Bayer <dev@doubly.so>
> [kvalo@codeaurora.org: cleanup commit log, move to pci.c]
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath-next branch of ath.git, thanks.

3dbd7fe78c42 ath11k: pci: add MODULE_FIRMWARE macros
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index af59c23fea56..2add42ce729b 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -991,3 +991,9 @@  EXPORT_SYMBOL(ath11k_core_resume);
 
 MODULE_DESCRIPTION("Core module for Qualcomm Atheros 802.11ax wireless LAN cards.");
 MODULE_LICENSE("Dual BSD/GPL");
+
+/* QCA639x 2.0 firmware files */
+MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_BOARD_API2_FILE);
+MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_AMSS_FILE);
+MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_M3_FILE);
+