source of highlighter
plain | download
    1 diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
    2 index f49e05f32022..7ec307f76c9f 100644
    3 --- a/drivers/net/wireless/ath/ath10k/core.c
    4 +++ b/drivers/net/wireless/ath/ath10k/core.c
    5 @@ -199,6 +199,33 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
    6                 .vht160_mcs_tx_highest = 0,
    7         },
    8         {
    9 +               .id = QCA6174_HW_3_2_VERSION,
   10 +               .dev_id = QCA9377_1_0_DEVICE_ID,
   11 +               .name = "qca6174 hw3.2 sdio",
   12 +               .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
   13 +               .uart_pin = 6,
   14 +               .otp_exe_param = 0,
   15 +               .channel_counters_freq_hz = 88000,
   16 +               .max_probe_resp_desc_thres = 0,
   17 +               .cal_data_len = 8124,
   18 +               .fw = {
   19 +                       /* uses same binaries as hw3.0 */
   20 +                       .dir = QCA6174_HW_3_0_FW_DIR,
   21 +                       .board = QCA6174_HW_3_0_BOARD_DATA_FILE_SDIO,
   22 +                       .board_size = QCA6174_BOARD_DATA_SZ,
   23 +                       .board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
   24 +               },
   25 +               .hw_ops = &qca6174_ops,
   26 +               .hw_clk = qca6174_clk,
   27 +               .target_cpu_freq = 176000000,
   28 +               .decap_align_bytes = 4,
   29 +               .spectral_bin_discard = 0,
   30 +               .max_num_peers = TARGET_QCA6174_HL_NUM_PEERS,
   31 +               .is_high_latency = true,
   32 +               .bus = ATH10K_BUS_SDIO,
   33 +               .start_once = true,
   34 +       },
   35 +       {
   36                 .id = QCA99X0_HW_2_0_DEV_VERSION,
   37                 .dev_id = QCA99X0_2_0_DEVICE_ID,
   38                 .name = "qca99x0 hw2.0",
   39 @@ -1745,6 +1772,7 @@ static int ath10k_init_hw_params(struct ath10k *ar)
   40                         /* High latency devices will use different fw depending
   41                          * on if it is a USB or SDIO device.
   42                          */
   43 +                       ath10k_err(ar, "%i %i, %x %x, %x %x\n", hw_params->bus, ar->hif.bus, hw_params->id, ar->target_version, hw_params->dev_id, ar->dev_id);
   44                         if (hw_params->bus == ar->hif.bus &&
   45                             hw_params->id == ar->target_version &&
   46                             hw_params->dev_id == ar->dev_id)
   47 diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
   48 index daed76ff6e76..9420d7e85225 100644
   49 --- a/drivers/net/wireless/ath/ath10k/hw.h
   50 +++ b/drivers/net/wireless/ath/ath10k/hw.h
   51 @@ -96,6 +96,7 @@ enum qca9377_chip_id_rev {
   52  
   53  #define QCA6174_HW_3_0_FW_DIR          "ath10k/QCA6174/hw3.0"
   54  #define QCA6174_HW_3_0_BOARD_DATA_FILE "board.bin"
   55 +#define QCA6174_HW_3_0_BOARD_DATA_FILE_SDIO    "board-sdio.bin"
   56  #define QCA6174_HW_3_0_PATCH_LOAD_ADDR 0x1234
   57  
   58  /* QCA99X0 1.0 definitions (unsupported) */
   59 @@ -688,7 +689,8 @@ ath10k_rx_desc_get_l3_pad_bytes(struct ath10k_hw_params *hw,
   60  #define TARGET_TLV_NUM_MSDU_DESC_HL            64
   61  #define TARGET_TLV_NUM_WOW_PATTERNS            22
   62  
   63 -/* Target specific defines for QCA9377 high latency firmware */
   64 +/* Target specific defines for QCA6174 and QCA9377 high latency firmware */
   65 +#define TARGET_QCA6174_HL_NUM_PEERS            15
   66  #define TARGET_QCA9377_HL_NUM_PEERS            15
   67  
   68  /* Diagnostic Window */