leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath6kl: remove hw version related parameter defines

Browse Source 
Having separate defines, in a different file, makes it difficult to read
the actual values. As we are just setting named fields in a struct
the defines don't make any sense anymore.

There are no functional changes, only moving of constants.

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

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

@ -1337,32 +1337,32 @@ static int ath6kl_init_hw_params(struct ath6kl *ar)
{ {
switch (ar->version.target_ver) { switch (ar->version.target_ver) {
case AR6003_REV2_VERSION: case AR6003_REV2_VERSION:
ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS; ar->hw.dataset_patch_addr = 0x57e884;
ar->hw.app_load_addr = AR6003_REV2_APP_LOAD_ADDRESS; ar->hw.app_load_addr = 0x543180;
ar->hw.board_ext_data_addr = AR6003_REV2_BOARD_EXT_DATA_ADDRESS; ar->hw.board_ext_data_addr = 0x57e500;
ar->hw.reserved_ram_size = AR6003_REV2_RAM_RESERVE_SIZE; ar->hw.reserved_ram_size = 6912;
/* hw2.0 needs override address hardcoded */ /* hw2.0 needs override address hardcoded */
ar->hw.app_start_override_addr = 0x944C00; ar->hw.app_start_override_addr = 0x944C00;
break; break;
case AR6003_REV3_VERSION: case AR6003_REV3_VERSION:
ar->hw.dataset_patch_addr = AR6003_REV3_DATASET_PATCH_ADDRESS; ar->hw.dataset_patch_addr = 0x57ff74;
ar->hw.app_load_addr = 0x1234; ar->hw.app_load_addr = 0x1234;
ar->hw.board_ext_data_addr = AR6003_REV3_BOARD_EXT_DATA_ADDRESS; ar->hw.board_ext_data_addr = 0x542330;
ar->hw.reserved_ram_size = AR6003_REV3_RAM_RESERVE_SIZE; ar->hw.reserved_ram_size = 512;
break; break;
case AR6004_REV1_VERSION: case AR6004_REV1_VERSION:
ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS; ar->hw.dataset_patch_addr = 0x57e884;
ar->hw.app_load_addr = 0x1234; ar->hw.app_load_addr = 0x1234;
ar->hw.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS; ar->hw.board_ext_data_addr = 0x437000;
ar->hw.reserved_ram_size = AR6004_REV1_RAM_RESERVE_SIZE; ar->hw.reserved_ram_size = 19456;
break; break;
case AR6004_REV2_VERSION: case AR6004_REV2_VERSION:
ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS; ar->hw.dataset_patch_addr = 0x57e884;
ar->hw.app_load_addr = 0x1234; ar->hw.app_load_addr = 0x1234;
ar->hw.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS; ar->hw.board_ext_data_addr = 0x437000;
ar->hw.reserved_ram_size = AR6004_REV2_RAM_RESERVE_SIZE; ar->hw.reserved_ram_size = 11264;
break; break;
default: default:
ath6kl_err("Unsupported hardware version: 0x%x\n", ath6kl_err("Unsupported hardware version: 0x%x\n",

14
drivers/net/wireless/ath/ath6kl/target.h
View File

@ -334,22 +334,8 @@ struct host_interest {
(((target_type) == TARGET_TYPE_AR6003) ? AR6003_VTOP(vaddr) : \ (((target_type) == TARGET_TYPE_AR6003) ? AR6003_VTOP(vaddr) : \
(((target_type) == TARGET_TYPE_AR6004) ? AR6004_VTOP(vaddr) : 0)) (((target_type) == TARGET_TYPE_AR6004) ? AR6004_VTOP(vaddr) : 0))
#define AR6003_REV2_APP_LOAD_ADDRESS 0x543180
#define AR6003_REV2_BOARD_EXT_DATA_ADDRESS 0x57E500
#define AR6003_REV2_DATASET_PATCH_ADDRESS 0x57e884
#define AR6003_REV2_RAM_RESERVE_SIZE 6912
#define AR6003_REV3_APP_LOAD_ADDRESS 0x545000
#define AR6003_REV3_BOARD_EXT_DATA_ADDRESS 0x542330
#define AR6003_REV3_DATASET_PATCH_ADDRESS 0x57FF74
#define AR6003_REV3_RAM_RESERVE_SIZE 512
#define AR6004_REV1_BOARD_DATA_ADDRESS 0x433900 #define AR6004_REV1_BOARD_DATA_ADDRESS 0x433900
#define AR6004_REV1_BOARD_EXT_DATA_ADDRESS 0x437000
#define AR6004_REV1_RAM_RESERVE_SIZE 19456
#define AR6004_REV2_BOARD_DATA_ADDRESS 0x43d400 #define AR6004_REV2_BOARD_DATA_ADDRESS 0x43d400
#define AR6004_REV2_RAM_RESERVE_SIZE 11264
#define ATH6KL_FWLOG_PAYLOAD_SIZE 1500 #define ATH6KL_FWLOG_PAYLOAD_SIZE 1500