lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath6kl: move hw version related to parameters to struct

Browse Source 
It's easier to handle the values when they are defined in a struct.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Kalle Valo
2011-11-14 19:30:29 +02:00
parent f275dc7117
commit 856f4b313a
2 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/ath/ath6kl/core.h
View File

@@ -541,7 +541,8 @@ struct ath6kl {
size_t rx_report_len; size_t rx_report_len;
} tm; } tm;
struct { struct ath6kl_hw {
u32 id;
u32 dataset_patch_addr; u32 dataset_patch_addr;
u32 app_load_addr; u32 app_load_addr;
u32 app_start_override_addr; u32 app_start_override_addr;

73
drivers/net/wireless/ath/ath6kl/init.c
View File

@@ -33,6 +33,40 @@ module_param(debug_mask, uint, 0644);
module_param(testmode, uint, 0644); module_param(testmode, uint, 0644);
module_param(suspend_cutpower, bool, 0444); module_param(suspend_cutpower, bool, 0444);
static const struct ath6kl_hw hw_list[] = {
{
.id = AR6003_REV2_VERSION,
.dataset_patch_addr = 0x57e884,
.app_load_addr = 0x543180,
.board_ext_data_addr = 0x57e500,
.reserved_ram_size = 6912,
/* hw2.0 needs override address hardcoded */
.app_start_override_addr = 0x944C00,
},
{
.id = AR6003_REV3_VERSION,
.dataset_patch_addr = 0x57ff74,
.app_load_addr = 0x1234,
.board_ext_data_addr = 0x542330,
.reserved_ram_size = 512,
},
{
.id = AR6004_REV1_VERSION,
.dataset_patch_addr = 0x57e884,
.app_load_addr = 0x1234,
.board_ext_data_addr = 0x437000,
.reserved_ram_size = 19456,
},
{
.id = AR6004_REV2_VERSION,
.dataset_patch_addr = 0x57e884,
.app_load_addr = 0x1234,
.board_ext_data_addr = 0x437000,
.reserved_ram_size = 11264,
},
};
/* /*
* Include definitions here that can be used to tune the WLAN module * Include definitions here that can be used to tune the WLAN module
* behavior. Different customers can tune the behavior as per their needs, * behavior. Different customers can tune the behavior as per their needs,
@@ -1335,41 +1369,24 @@ static int ath6kl_init_upload(struct ath6kl *ar)
static int ath6kl_init_hw_params(struct ath6kl *ar) static int ath6kl_init_hw_params(struct ath6kl *ar)
{ {
switch (ar->version.target_ver) { const struct ath6kl_hw *hw;
case AR6003_REV2_VERSION: int i;
ar->hw.dataset_patch_addr = 0x57e884;
ar->hw.app_load_addr = 0x543180;
ar->hw.board_ext_data_addr = 0x57e500;
ar->hw.reserved_ram_size = 6912;
/* hw2.0 needs override address hardcoded */ for (i = 0; i < ARRAY_SIZE(hw_list); i++) {
ar->hw.app_start_override_addr = 0x944C00; hw = &hw_list[i];
break; if (hw->id == ar->version.target_ver)
case AR6003_REV3_VERSION: break;
ar->hw.dataset_patch_addr = 0x57ff74; }
ar->hw.app_load_addr = 0x1234;
ar->hw.board_ext_data_addr = 0x542330; if (i == ARRAY_SIZE(hw_list)) {
ar->hw.reserved_ram_size = 512;
break;
case AR6004_REV1_VERSION:
ar->hw.dataset_patch_addr = 0x57e884;
ar->hw.app_load_addr = 0x1234;
ar->hw.board_ext_data_addr = 0x437000;
ar->hw.reserved_ram_size = 19456;
break;
case AR6004_REV2_VERSION:
ar->hw.dataset_patch_addr = 0x57e884;
ar->hw.app_load_addr = 0x1234;
ar->hw.board_ext_data_addr = 0x437000;
ar->hw.reserved_ram_size = 11264;
break;
default:
ath6kl_err("Unsupported hardware version: 0x%x\n", ath6kl_err("Unsupported hardware version: 0x%x\n",
ar->version.target_ver); ar->version.target_ver);
return -EINVAL; return -EINVAL;
} }
ar->hw = *hw;
ath6kl_dbg(ATH6KL_DBG_BOOT, ath6kl_dbg(ATH6KL_DBG_BOOT,
"target_ver 0x%x target_type 0x%x dataset_patch 0x%x app_load_addr 0x%x\n", "target_ver 0x%x target_type 0x%x dataset_patch 0x%x app_load_addr 0x%x\n",
ar->version.target_ver, ar->target_type, ar->version.target_ver, ar->target_type,