diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-14 12:30:13 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-16 03:22:33 -0500 |
commit | f275dc7117c4a9847ee0380ca1a355b18d616b09 (patch) | |
tree | 4cfef4dc7c0c4320b95b7d65d7779317ed948ddb /drivers/net | |
parent | be5abaafad8090a5051355b1d224bfbae0951fc2 (diff) |
ath6kl: remove hw version related parameter defines
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/init.c | 26 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/target.h | 14 |
2 files changed, 13 insertions, 27 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index e96ce07281ec..3286b1b564f9 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c | |||
@@ -1337,32 +1337,32 @@ static int ath6kl_init_hw_params(struct ath6kl *ar) | |||
1337 | { | 1337 | { |
1338 | switch (ar->version.target_ver) { | 1338 | switch (ar->version.target_ver) { |
1339 | case AR6003_REV2_VERSION: | 1339 | case AR6003_REV2_VERSION: |
1340 | ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS; | 1340 | ar->hw.dataset_patch_addr = 0x57e884; |
1341 | ar->hw.app_load_addr = AR6003_REV2_APP_LOAD_ADDRESS; | 1341 | ar->hw.app_load_addr = 0x543180; |
1342 | ar->hw.board_ext_data_addr = AR6003_REV2_BOARD_EXT_DATA_ADDRESS; | 1342 | ar->hw.board_ext_data_addr = 0x57e500; |
1343 | ar->hw.reserved_ram_size = AR6003_REV2_RAM_RESERVE_SIZE; | 1343 | ar->hw.reserved_ram_size = 6912; |
1344 | 1344 | ||
1345 | /* hw2.0 needs override address hardcoded */ | 1345 | /* hw2.0 needs override address hardcoded */ |
1346 | ar->hw.app_start_override_addr = 0x944C00; | 1346 | ar->hw.app_start_override_addr = 0x944C00; |
1347 | 1347 | ||
1348 | break; | 1348 | break; |
1349 | case AR6003_REV3_VERSION: | 1349 | case AR6003_REV3_VERSION: |
1350 | ar->hw.dataset_patch_addr = AR6003_REV3_DATASET_PATCH_ADDRESS; | 1350 | ar->hw.dataset_patch_addr = 0x57ff74; |
1351 | ar->hw.app_load_addr = 0x1234; | 1351 | ar->hw.app_load_addr = 0x1234; |
1352 | ar->hw.board_ext_data_addr = AR6003_REV3_BOARD_EXT_DATA_ADDRESS; | 1352 | ar->hw.board_ext_data_addr = 0x542330; |
1353 | ar->hw.reserved_ram_size = AR6003_REV3_RAM_RESERVE_SIZE; | 1353 | ar->hw.reserved_ram_size = 512; |
1354 | break; | 1354 | break; |
1355 | case AR6004_REV1_VERSION: | 1355 | case AR6004_REV1_VERSION: |
1356 | ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS; | 1356 | ar->hw.dataset_patch_addr = 0x57e884; |
1357 | ar->hw.app_load_addr = 0x1234; | 1357 | ar->hw.app_load_addr = 0x1234; |
1358 | ar->hw.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS; | 1358 | ar->hw.board_ext_data_addr = 0x437000; |
1359 | ar->hw.reserved_ram_size = AR6004_REV1_RAM_RESERVE_SIZE; | 1359 | ar->hw.reserved_ram_size = 19456; |
1360 | break; | 1360 | break; |
1361 | case AR6004_REV2_VERSION: | 1361 | case AR6004_REV2_VERSION: |
1362 | ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS; | 1362 | ar->hw.dataset_patch_addr = 0x57e884; |
1363 | ar->hw.app_load_addr = 0x1234; | 1363 | ar->hw.app_load_addr = 0x1234; |
1364 | ar->hw.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS; | 1364 | ar->hw.board_ext_data_addr = 0x437000; |
1365 | ar->hw.reserved_ram_size = AR6004_REV2_RAM_RESERVE_SIZE; | 1365 | ar->hw.reserved_ram_size = 11264; |
1366 | break; | 1366 | break; |
1367 | default: | 1367 | default: |
1368 | ath6kl_err("Unsupported hardware version: 0x%x\n", | 1368 | ath6kl_err("Unsupported hardware version: 0x%x\n", |
diff --git a/drivers/net/wireless/ath/ath6kl/target.h b/drivers/net/wireless/ath/ath6kl/target.h index 35478d408c35..ece0f1312ea9 100644 --- a/drivers/net/wireless/ath/ath6kl/target.h +++ b/drivers/net/wireless/ath/ath6kl/target.h | |||
@@ -334,22 +334,8 @@ struct host_interest { | |||
334 | (((target_type) == TARGET_TYPE_AR6003) ? AR6003_VTOP(vaddr) : \ | 334 | (((target_type) == TARGET_TYPE_AR6003) ? AR6003_VTOP(vaddr) : \ |
335 | (((target_type) == TARGET_TYPE_AR6004) ? AR6004_VTOP(vaddr) : 0)) | 335 | (((target_type) == TARGET_TYPE_AR6004) ? AR6004_VTOP(vaddr) : 0)) |
336 | 336 | ||
337 | #define AR6003_REV2_APP_LOAD_ADDRESS 0x543180 | ||
338 | #define AR6003_REV2_BOARD_EXT_DATA_ADDRESS 0x57E500 | ||
339 | #define AR6003_REV2_DATASET_PATCH_ADDRESS 0x57e884 | ||
340 | #define AR6003_REV2_RAM_RESERVE_SIZE 6912 | ||
341 | |||
342 | #define AR6003_REV3_APP_LOAD_ADDRESS 0x545000 | ||
343 | #define AR6003_REV3_BOARD_EXT_DATA_ADDRESS 0x542330 | ||
344 | #define AR6003_REV3_DATASET_PATCH_ADDRESS 0x57FF74 | ||
345 | #define AR6003_REV3_RAM_RESERVE_SIZE 512 | ||
346 | |||
347 | #define AR6004_REV1_BOARD_DATA_ADDRESS 0x433900 | 337 | #define AR6004_REV1_BOARD_DATA_ADDRESS 0x433900 |
348 | #define AR6004_REV1_BOARD_EXT_DATA_ADDRESS 0x437000 | ||
349 | #define AR6004_REV1_RAM_RESERVE_SIZE 19456 | ||
350 | |||
351 | #define AR6004_REV2_BOARD_DATA_ADDRESS 0x43d400 | 338 | #define AR6004_REV2_BOARD_DATA_ADDRESS 0x43d400 |
352 | #define AR6004_REV2_RAM_RESERVE_SIZE 11264 | ||
353 | 339 | ||
354 | #define ATH6KL_FWLOG_PAYLOAD_SIZE 1500 | 340 | #define ATH6KL_FWLOG_PAYLOAD_SIZE 1500 |
355 | 341 | ||