From f08aa23ba5d54806bbb3c7106f195094cf62362e Mon Sep 17 00:00:00 2001 From: Adrian Nicolau Date: Mon, 2 Feb 2026 15:25:43 +0200 Subject: [PATCH 1/2] ath12k: support board firmware per machine type --- drivers/net/wireless/ath/ath12k/core.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c index cc352eef19399..0f0bcb33e0228 100644 --- a/drivers/net/wireless/ath/ath12k/core.c +++ b/drivers/net/wireless/ath/ath12k/core.c @@ -518,7 +518,7 @@ int ath12k_core_fetch_board_data_api_1(struct ath12k_base *ab, int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) { char boardname[BOARD_NAME_SIZE], fallback_boardname[BOARD_NAME_SIZE]; - char *filename, filepath[100]; + char *filename, default_filename[100], filepath[100]; int bd_api; int ret; @@ -553,7 +553,19 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) goto success; bd_api = 1; - ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_DEFAULT_BOARD_FILE); + + if (of_machine_is_compatible("siklu,n366")) { + strscpy(default_filename, "board-n366.bin", + sizeof(default_filename)); + } else if (of_machine_is_compatible("siklu,ipq6018-ctu")) { + strscpy(default_filename, "board-fr2.bin", + sizeof(default_filename)); + } else { + strscpy(default_filename, ATH12K_DEFAULT_BOARD_FILE, + sizeof(default_filename)); + } + + ret = ath12k_core_fetch_board_data_api_1(ab, bd, default_filename); if (ret) { ath12k_core_create_firmware_path(ab, filename, filepath, sizeof(filepath)); @@ -563,7 +575,7 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) ath12k_err(ab, "failed to fetch board data for %s from %s\n", fallback_boardname, filepath); - ath12k_err(ab, "failed to fetch board.bin from %s\n", + ath12k_err(ab, "failed to fetch %s from %s\n", default_filename, ab->hw_params->fw.dir); return ret; } From d5681290ee9e094cbd5d8d8b2f2b9145d1aa556e Mon Sep 17 00:00:00 2001 From: Adrian Nicolau Date: Tue, 3 Feb 2026 09:38:55 +0200 Subject: [PATCH 2/2] add info log --- drivers/net/wireless/ath/ath12k/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c index 0f0bcb33e0228..a551c6bdd619c 100644 --- a/drivers/net/wireless/ath/ath12k/core.c +++ b/drivers/net/wireless/ath/ath12k/core.c @@ -582,6 +582,7 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) success: ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %d\n", bd_api); + ath12k_info(ab, "using board firmware %s\n", default_filename); return 0; }