lede/package/kernel/mac80211/patches/ath11k/100-ath11k-load-appropriate-board-data-from-board-id.patch
2021-06-24 12:20:23 +08:00

48 lines
1.6 KiB
Diff

From 89aec0a67ee30cd11762aede86b3edfdb2433663 Mon Sep 17 00:00:00 2001
From: Venkateswara Naralasetty <vnaralas@codeaurora.org>
Date: Thu, 2 Jul 2020 12:04:34 +0530
Subject: [PATCH] ath11k: load appropriate board data based on board id
This patch adds support to read board id from dts and load
appropriate board data.
Adding the patch which was removed as a part of commit id -
Ib950b3271fede9ccf7d53fe9629c38ee729a0ef5
Signed-off-by: Venkateswara Naralasetty <vnaralas@codeaurora.org>
Signed-off-by: Lavanya Suresh <lavaks@codeaurora.org>
---
drivers/net/wireless/ath/ath11k/qmi.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -1811,9 +1811,11 @@ static int ath11k_qmi_assign_target_mem_
static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
{
+ struct device *dev = ab->dev;
struct qmi_wlanfw_cap_req_msg_v01 req;
struct qmi_wlanfw_cap_resp_msg_v01 resp;
struct qmi_txn txn = {};
+ unsigned int board_id;
int ret = 0;
int r;
@@ -1853,10 +1855,13 @@ static int ath11k_qmi_request_target_cap
ab->qmi.target.chip_family = resp.chip_info.chip_family;
}
- if (resp.board_info_valid)
+ if (!of_property_read_u32(dev->of_node, "qcom,board_id", &board_id) && board_id != 0xFF) {
+ ab->qmi.target.board_id = board_id;
+ } else if (resp.board_info_valid) {
ab->qmi.target.board_id = resp.board_info.board_id;
- else
+ } else {
ab->qmi.target.board_id = 0xFF;
+ }
if (resp.soc_info_valid)
ab->qmi.target.soc_id = resp.soc_info.soc_id;