Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d4d72bf authored by Kalle Valo's avatar Kalle Valo
Browse files

ath6kl: add board address to struct ath6kl_hw 



This is to make it configurable by firmware IEs. Also determine if we need
to write or read the board address to the chip by checking if board address
is set or not.

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 856f4b31

drivers/net/wireless/ath/ath6kl/core.h

+1 −0
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ struct ath6kl { 
		u32 app_start_override_addr;

		u32 board_ext_data_addr;

		u32 reserved_ram_size;

		u32 board_addr;

	} hw;



	u16 conf_flags;

drivers/net/wireless/ath/ath6kl/init.c

+4 −6
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static const struct ath6kl_hw hw_list[] = { 
		.app_load_addr			= 0x1234,

		.board_ext_data_addr		= 0x437000,

		.reserved_ram_size		= 19456,

		.board_addr			= 0x433900,

	},

	{

		.id				= AR6004_REV2_VERSION,
@@ -64,6 +65,7 @@ static const struct ath6kl_hw hw_list[] = { 
		.app_load_addr			= 0x1234,

		.board_ext_data_addr		= 0x437000,

		.reserved_ram_size		= 11264,

		.board_addr			= 0x43d400,

	},

};
@@ -1031,12 +1033,8 @@ static int ath6kl_upload_board_file(struct ath6kl *ar) 
	 * For AR6004, host determine Target RAM address for

	 * writing board data.

	 */

	if (ar->target_type == TARGET_TYPE_AR6004) {

		if (ar->version.target_ver == AR6004_REV1_VERSION)

			board_address = AR6004_REV1_BOARD_DATA_ADDRESS;

		else

			board_address = AR6004_REV2_BOARD_DATA_ADDRESS;



	if (ar->hw.board_addr != 0) {

		board_address = ar->hw.board_addr;

		ath6kl_bmi_write(ar,

				ath6kl_get_hi_item_addr(ar,

				HI_ITEM(hi_board_data)),

drivers/net/wireless/ath/ath6kl/target.h

+0 −3
Original line number Diff line number Diff line
@@ -334,9 +334,6 @@ struct host_interest { 
	(((target_type) == TARGET_TYPE_AR6003) ? AR6003_VTOP(vaddr) : \

	(((target_type) == TARGET_TYPE_AR6004) ? AR6004_VTOP(vaddr) : 0))



#define AR6004_REV1_BOARD_DATA_ADDRESS          0x433900

#define AR6004_REV2_BOARD_DATA_ADDRESS          0x43d400



#define ATH6KL_FWLOG_PAYLOAD_SIZE		1500



struct ath6kl_dbglog_buf {