Commit 3ebae49b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Kalle Valo
Browse files

wifi: ath10k: drop fw.eboard file name 



Follow the example set up by previous commit and drop .fw.eboard
setting. Instead always use "eboard.bin" in this case. QCA9984 already
uses that file name, any (im)possible future users will just have to use
the same file name.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240130-wcn3990-board-fw-v1-3-738f7c19a8c8@linaro.org
parent de0ff461

drivers/net/wireless/ath/ath10k/core.c

+1 −7
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 12064,

		.fw = {

			.dir = QCA9984_HW_1_0_FW_DIR,

			.eboard = QCA9984_HW_1_0_EBOARD_DATA_FILE,

			.board_size = QCA99X0_BOARD_DATA_SZ,

			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

			.ext_board_size = QCA99X0_EXT_BOARD_DATA_SZ,
@@ -1303,13 +1302,8 @@ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type) 
		ar->normal_mode_fw.board_data = ar->normal_mode_fw.board->data;

		ar->normal_mode_fw.board_len = ar->normal_mode_fw.board->size;

	} else if (bd_ie_type == ATH10K_BD_IE_BOARD_EXT) {

		if (!ar->hw_params.fw.eboard) {

			ath10k_err(ar, "failed to find eboard file fw entry\n");

			return -EINVAL;

		}



		fw = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir,

					  ar->hw_params.fw.eboard);

					  ATH10K_EBOARD_DATA_FILE);

		ar->normal_mode_fw.ext_board = fw;

		if (IS_ERR(ar->normal_mode_fw.ext_board))

			return PTR_ERR(ar->normal_mode_fw.ext_board);

drivers/net/wireless/ath/ath10k/hw.h

+1 −2
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ enum qca9377_chip_id_rev { 
#define QCA9984_HW_DEV_TYPE		0xa

#define QCA9984_HW_1_0_CHIP_ID_REV	0x0

#define QCA9984_HW_1_0_FW_DIR		ATH10K_FW_DIR "/QCA9984/hw1.0"

#define QCA9984_HW_1_0_EBOARD_DATA_FILE "eboard.bin"

#define QCA9984_HW_1_0_PATCH_LOAD_ADDR	0x1234



/* QCA9888 2.0 defines */
@@ -152,6 +151,7 @@ enum qca9377_chip_id_rev { 


#define ATH10K_BOARD_DATA_FILE         "board.bin"

#define ATH10K_BOARD_API2_FILE         "board-2.bin"

#define ATH10K_EBOARD_DATA_FILE        "eboard.bin"



#define REG_DUMP_COUNT_QCA988X 60
@@ -546,7 +546,6 @@ struct ath10k_hw_params { 
	struct ath10k_hw_params_fw {

		const char *dir;

		size_t board_size;

		const char *eboard;

		size_t ext_board_size;

		size_t board_ext_size;

	} fw;