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

Commit 293badf4 authored by Kalle Valo's avatar Kalle Valo
Browse files

ath6kl: add name field to struct ath6kl_hw 



To make it easier to print name for each hardware type. Also move the hw
info print to ath6kl_init_hw_start() which is more logical place for it.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ struct ath6kl { 


	struct ath6kl_hw {

		u32 id;

		const char *name;

		u32 dataset_patch_addr;

		u32 app_load_addr;

		u32 app_start_override_addr;

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

+25 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ module_param(suspend_cutpower, bool, 0444); 
static const struct ath6kl_hw hw_list[] = {

	{

		.id				= AR6003_REV2_VERSION,

		.name				= "ar6003 hw 2.0",

		.dataset_patch_addr		= 0x57e884,

		.app_load_addr			= 0x543180,

		.board_ext_data_addr		= 0x57e500,
@@ -46,6 +47,7 @@ static const struct ath6kl_hw hw_list[] = { 
	},

	{

		.id				= AR6003_REV3_VERSION,

		.name				= "ar6003 hw 2.1.1",

		.dataset_patch_addr		= 0x57ff74,

		.app_load_addr			= 0x1234,

		.board_ext_data_addr		= 0x542330,
@@ -53,6 +55,7 @@ static const struct ath6kl_hw hw_list[] = { 
	},

	{

		.id				= AR6004_REV1_VERSION,

		.name				= "ar6004 hw 1.0",

		.dataset_patch_addr		= 0x57e884,

		.app_load_addr			= 0x1234,

		.board_ext_data_addr		= 0x437000,
@@ -61,6 +64,7 @@ static const struct ath6kl_hw hw_list[] = { 
	},

	{

		.id				= AR6004_REV2_VERSION,

		.name				= "ar6004 hw 1.1",

		.dataset_patch_addr		= 0x57e884,

		.app_load_addr			= 0x1234,

		.board_ext_data_addr		= 0x437000,
@@ -1408,6 +1412,18 @@ static int ath6kl_init_hw_params(struct ath6kl *ar) 
	return 0;

}



static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type)

{

	switch (type) {

	case ATH6KL_HIF_TYPE_SDIO:

		return "sdio";

	case ATH6KL_HIF_TYPE_USB:

		return "usb";

	}



	return NULL;

}



int ath6kl_init_hw_start(struct ath6kl *ar)

{

	long timeleft;
@@ -1468,6 +1484,15 @@ int ath6kl_init_hw_start(struct ath6kl *ar) 


	ath6kl_dbg(ATH6KL_DBG_BOOT, "firmware booted\n");





	if (test_and_clear_bit(FIRST_BOOT, &ar->flag)) {

		ath6kl_info("%s %s fw %s%s\n",

			    ar->hw.name,

			    ath6kl_init_get_hif_name(ar->hif_type),

			    ar->wiphy->fw_version,

			    test_bit(TESTMODE, &ar->flag) ? " testmode" : "");

	}



	if (ar->version.abi_ver != ATH6KL_ABI_VERSION) {

		ath6kl_err("abi version mismatch: host(0x%x), target(0x%x)\n",

			   ATH6KL_ABI_VERSION, ar->version.abi_ver);

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

+0 −21
Original line number Diff line number Diff line
@@ -525,20 +525,6 @@ void ath6kl_disconnect(struct ath6kl_vif *vif) 


/* WMI Event handlers */



static const char *get_hw_id_string(u32 id)

{

	switch (id) {

	case AR6003_REV1_VERSION:

		return "1.0";

	case AR6003_REV2_VERSION:

		return "2.0";

	case AR6003_REV3_VERSION:

		return "2.1.1";

	default:

		return "unknown";

	}

}



void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver)

{

	struct ath6kl *ar = devt;
@@ -561,13 +547,6 @@ void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver) 
	/* indicate to the waiting thread that the ready event was received */

	set_bit(WMI_READY, &ar->flag);

	wake_up(&ar->event_wq);



	if (test_and_clear_bit(FIRST_BOOT, &ar->flag)) {

		ath6kl_info("hw %s fw %s%s\n",

			    get_hw_id_string(ar->wiphy->hw_version),

			    ar->wiphy->fw_version,

			    test_bit(TESTMODE, &ar->flag) ? " testmode" : "");

	}

}



void ath6kl_scan_complete_evt(struct ath6kl_vif *vif, int status)