diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-14 21:30:13 +0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-16 12:22:33 +0400 |
| commit | f275dc7117c4a9847ee0380ca1a355b18d616b09 (patch) | |
| tree | 4cfef4dc7c0c4320b95b7d65d7779317ed948ddb | |
| parent | be5abaafad8090a5051355b1d224bfbae0951fc2 (diff) | |
| download | linux-f275dc7117c4a9847ee0380ca1a355b18d616b09.tar.xz | |
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>
| -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) { switch (ar->version.target_ver) { case AR6003_REV2_VERSION: - ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS; - ar->hw.app_load_addr = AR6003_REV2_APP_LOAD_ADDRESS; - ar->hw.board_ext_data_addr = AR6003_REV2_BOARD_EXT_DATA_ADDRESS; - ar->hw.reserved_ram_size = AR6003_REV2_RAM_RESERVE_SIZE; + 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 */ ar->hw.app_start_override_addr = 0x944C00; break; 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.board_ext_data_addr = AR6003_REV3_BOARD_EXT_DATA_ADDRESS; - ar->hw.reserved_ram_size = AR6003_REV3_RAM_RESERVE_SIZE; + ar->hw.board_ext_data_addr = 0x542330; + ar->hw.reserved_ram_size = 512; break; 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.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS; - ar->hw.reserved_ram_size = AR6004_REV1_RAM_RESERVE_SIZE; + ar->hw.board_ext_data_addr = 0x437000; + ar->hw.reserved_ram_size = 19456; break; 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.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS; - ar->hw.reserved_ram_size = AR6004_REV2_RAM_RESERVE_SIZE; + ar->hw.board_ext_data_addr = 0x437000; + ar->hw.reserved_ram_size = 11264; break; default: 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 { (((target_type) == TARGET_TYPE_AR6003) ? AR6003_VTOP(vaddr) : \ (((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_EXT_DATA_ADDRESS 0x437000 -#define AR6004_REV1_RAM_RESERVE_SIZE 19456 - #define AR6004_REV2_BOARD_DATA_ADDRESS 0x43d400 -#define AR6004_REV2_RAM_RESERVE_SIZE 11264 #define ATH6KL_FWLOG_PAYLOAD_SIZE 1500 |