From 4dd4a6227258162ce039f7bae8fa5a44672633ba Mon Sep 17 00:00:00 2001 From: Venkateswara Swamy Bandaru Date: Tue, 7 Aug 2018 13:08:29 +0530 Subject: [PATCH] qcacmn: Extend target type checks of qca8074v1 to qca8074v2 Extend target type checks of qca8074v1 to qca8074v2 Change-Id: Ie5eba980af03c87f0086ffe2c2c89d7dc86dc71f CRs-Fixed: 2292315 --- spectral/dispatcher/src/wlan_spectral_tgt_api.c | 3 ++- target_if/init_deinit/src/service_ready_util.c | 1 + target_if/spectral/target_if_spectral.c | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spectral/dispatcher/src/wlan_spectral_tgt_api.c b/spectral/dispatcher/src/wlan_spectral_tgt_api.c index fcc2f66ee0af..dccdab69b6ef 100644 --- a/spectral/dispatcher/src/wlan_spectral_tgt_api.c +++ b/spectral/dispatcher/src/wlan_spectral_tgt_api.c @@ -286,7 +286,8 @@ tgt_spectral_register_to_dbr(struct wlan_objmgr_pdev *pdev) psoc = wlan_pdev_get_psoc(pdev); dbr_tx_ops = &psoc->soc_cb.tx_ops.dbr_tx_ops; - if (tgt_spectral_get_target_type(psoc) == TARGET_TYPE_QCA8074) + if ((tgt_spectral_get_target_type(psoc) == TARGET_TYPE_QCA8074) || + (tgt_spectral_get_target_type(psoc) == TARGET_TYPE_QCA8074V2)) if (dbr_tx_ops->direct_buf_rx_module_register) return dbr_tx_ops->direct_buf_rx_module_register (pdev, 0, diff --git a/target_if/init_deinit/src/service_ready_util.c b/target_if/init_deinit/src/service_ready_util.c index cf0f4286c948..fefd377c4cad 100644 --- a/target_if/init_deinit/src/service_ready_util.c +++ b/target_if/init_deinit/src/service_ready_util.c @@ -416,6 +416,7 @@ QDF_STATUS init_deinit_validate_160_80p80_fw_caps( wmi_handle = target_psoc_get_wmi_hdl(tgt_hdl); if ((tgt_hdl->info.target_type == TARGET_TYPE_QCA8074) || + (tgt_hdl->info.target_type == TARGET_TYPE_QCA8074V2) || (tgt_hdl->info.target_type == TARGET_TYPE_QCA6290)) { /** * Return true for now. This is not available in diff --git a/target_if/spectral/target_if_spectral.c b/target_if/spectral/target_if_spectral.c index b19876868c9d..b0d872b29f46 100644 --- a/target_if/spectral/target_if_spectral.c +++ b/target_if/spectral/target_if_spectral.c @@ -2004,15 +2004,17 @@ target_if_pdev_spectral_init(struct wlan_objmgr_pdev *pdev) target_if_spectral_clear_stats(spectral); #ifdef CONFIG_WIN - if (target_type == TARGET_TYPE_QCA8074) { + if ((target_type == TARGET_TYPE_QCA8074) || + (target_type == TARGET_TYPE_QCA8074V2)) { spectral->fftbin_size_war = 1; spectral->inband_fftbin_size_adj = 1; } else { spectral->fftbin_size_war = 0; spectral->inband_fftbin_size_adj = 0; } - if ((target_type == TARGET_TYPE_QCA8074) || ( - target_type == TARGET_TYPE_QCA6290)) { + if ((target_type == TARGET_TYPE_QCA8074) || + (target_type == TARGET_TYPE_QCA8074V2) || + (target_type == TARGET_TYPE_QCA6290)) { spectral->spectral_gen = SPECTRAL_GEN3; spectral->hdr_sig_exp = SPECTRAL_PHYERR_SIGNATURE_GEN3; spectral->tag_sscan_summary_exp =