wifi: ath10k: Deprecate qcom,ath10k-calibration-variant properties

Add support for calibration-like properties without 'ath10k' prefix,
while still keeping everything backwards compatible.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patch.msgid.link/20250225-b-wifi-qcom-calibration-variant-v1-4-3b2aa3f89c53@linaro.org
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
This commit is contained in:
Krzysztof Kozlowski
2025-02-25 10:05:35 +01:00
committed by Jeff Johnson
parent 64e37c1938
commit a97ed4ecb7

View File

@@ -1163,8 +1163,11 @@ int ath10k_core_check_dt(struct ath10k *ar)
if (!node)
return -ENOENT;
of_property_read_string(node, "qcom,ath10k-calibration-variant",
of_property_read_string(node, "qcom,calibration-variant",
&variant);
if (!variant)
of_property_read_string(node, "qcom,ath10k-calibration-variant",
&variant);
if (!variant)
return -ENODATA;
@@ -2259,7 +2262,9 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar)
"boot did not find a pre calibration file, try DT next: %d\n",
ret);
ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data");
ret = ath10k_download_cal_dt(ar, "qcom,pre-calibration-data");
if (ret == -ENOENT)
ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data");
if (ret) {
ath10k_dbg(ar, ATH10K_DBG_BOOT,
"unable to load pre cal data from DT: %d\n", ret);
@@ -2337,7 +2342,9 @@ static int ath10k_download_cal_data(struct ath10k *ar)
"boot did not find a calibration file, try DT next: %d\n",
ret);
ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data");
ret = ath10k_download_cal_dt(ar, "qcom,calibration-data");
if (ret == -ENOENT)
ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data");
if (ret == 0) {
ar->cal_mode = ATH10K_CAL_MODE_DT;
goto done;