| Message ID | 20170917194013.8658-9-erik.stromdahl@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Erik Stromdahl <erik.stromdahl@gmail.com> writes: > Hardware parameters for QCA9377 usb devices. > > Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com> [...] > --- a/drivers/net/wireless/ath/ath10k/hw.h > +++ b/drivers/net/wireless/ath/ath10k/hw.h > @@ -127,6 +127,7 @@ enum qca9377_chip_id_rev { > /* QCA9377 1.0 definitions */ > #define QCA9377_HW_1_0_FW_DIR ATH10K_FW_DIR "/QCA9377/hw1.0" > #define QCA9377_HW_1_0_BOARD_DATA_FILE "board.bin" > +#define QCA9377_HW_1_0_BOARD_DATA_FILE_USB "board-usb.bin" > #define QCA9377_HW_1_0_PATCH_LOAD_ADDR 0x1234 Not sure if we need board-usb.bin. board-2.bin already has a bus attribute and board.bin is supposed to be used only by developers etc.
Erik Stromdahl <erik.stromdahl@gmail.com> writes: > Hardware parameters for QCA9377 usb devices. > > Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com> [...] > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -328,6 +328,29 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { > .vht160_mcs_rx_highest = 0, > .vht160_mcs_tx_highest = 0, > }, > + { > + .id = QCA9377_HW_1_1_DEV_VERSION, > + .dev_id = QCA9377_1_0_DEVICE_ID, > + .name = "qca9377 hw1.1 usb", > + .patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR, > + .uart_pin = 6, > + .otp_exe_param = 0, > + .channel_counters_freq_hz = 88000, > + .max_probe_resp_desc_thres = 0, > + .cal_data_len = 8124, > + .fw = { > + .dir = QCA9377_HW_1_0_FW_DIR, > + .board = QCA9377_HW_1_0_BOARD_DATA_FILE_USB, > + .board_size = QCA9377_BOARD_DATA_SZ, > + .board_ext_size = QCA9377_BOARD_EXT_DATA_SZ, > + }, > + .hw_ops = &qca988x_ops, > + .decap_align_bytes = 4, > + .max_num_peers = TARGET_QCA9377_HL_NUM_PEERS, > + .is_high_latency = true, > + .bus = ATH10K_BUS_USB, > + .start_once = true, > + }, Oh, forgot to mention that adding hw_params entry should be last in the patchset and only added once all fixes etc are already in place (eg patch 10 and 11 should be before this).
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 1880570989ae..b6893254ef53 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -328,6 +328,29 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .vht160_mcs_rx_highest = 0, .vht160_mcs_tx_highest = 0, }, + { + .id = QCA9377_HW_1_1_DEV_VERSION, + .dev_id = QCA9377_1_0_DEVICE_ID, + .name = "qca9377 hw1.1 usb", + .patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR, + .uart_pin = 6, + .otp_exe_param = 0, + .channel_counters_freq_hz = 88000, + .max_probe_resp_desc_thres = 0, + .cal_data_len = 8124, + .fw = { + .dir = QCA9377_HW_1_0_FW_DIR, + .board = QCA9377_HW_1_0_BOARD_DATA_FILE_USB, + .board_size = QCA9377_BOARD_DATA_SZ, + .board_ext_size = QCA9377_BOARD_EXT_DATA_SZ, + }, + .hw_ops = &qca988x_ops, + .decap_align_bytes = 4, + .max_num_peers = TARGET_QCA9377_HL_NUM_PEERS, + .is_high_latency = true, + .bus = ATH10K_BUS_USB, + .start_once = true, + }, { .id = QCA4019_HW_1_0_DEV_VERSION, .dev_id = 0, diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index fd0536077404..420851e26a09 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -127,6 +127,7 @@ enum qca9377_chip_id_rev { /* QCA9377 1.0 definitions */ #define QCA9377_HW_1_0_FW_DIR ATH10K_FW_DIR "/QCA9377/hw1.0" #define QCA9377_HW_1_0_BOARD_DATA_FILE "board.bin" +#define QCA9377_HW_1_0_BOARD_DATA_FILE_USB "board-usb.bin" #define QCA9377_HW_1_0_PATCH_LOAD_ADDR 0x1234 /* QCA4019 1.0 definitions */
Hardware parameters for QCA9377 usb devices. Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com> --- drivers/net/wireless/ath/ath10k/core.c | 23 +++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + 2 files changed, 24 insertions(+)