[PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

Dependency
==========
RFC, because this should be merged release after driver support is
merged:
https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t

Change will affect out of tree users, like other projects, of this DTS.

Description
===========
The property qcom,ath10k/11k-calibration-variant was deprecated in favor
of recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Best regards,
Krzysztof

---
Krzysztof Kozlowski (13):
      ARM: dts: qcom: ipq4018: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: msm8998: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sc7180: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sdm845: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sm6115: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sm8150-hdk: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: qcm6490: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sa8775p-ride: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sc8280xp: Switch to undeprecated qcom,calibration-variant
      arm64: dts: qcom: sm8250-elish: Switch to undeprecated qcom,calibration-variant

 arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi         | 2 +-
 arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts           | 4 ++--
 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts       | 2 +-
 arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts         | 2 +-
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts                   | 2 +-
 arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts           | 2 +-
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts               | 2 +-
 arch/arm64/boot/dts/qcom/qrb2210-rb1.dts                   | 2 +-
 arch/arm64/boot/dts/qcom/qrb4210-rb2.dts                   | 2 +-
 arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi                 | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi      | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts     | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi         | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi    | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi        | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi   | 2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts                  | 2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts     | 2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts  | 2 +-
 arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts        | 2 +-
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts                 | 2 +-
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts                    | 2 +-
 arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts       | 2 +-
 arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts            | 2 +-
 arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts          | 2 +-
 arch/arm64/boot/dts/qcom/sm8150-hdk.dts                    | 2 +-
 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi   | 2 +-
 28 files changed, 29 insertions(+), 29 deletions(-)
---
base-commit: 0b711700b3e432d036512ecd580d1312707a11da
change-id: 20250225-dts-qcom-wifi-calibration-a3aa0094e731
prerequisite-change-id: 20250225-b-wifi-qcom-calibration-variant-92a02995e996:v1
prerequisite-patch-id: 3d5e2355edb04751d04c86263d1aadba0f309fc9
prerequisite-patch-id: 939f220d1859ffb79d2d74d38b8ebdafd5e11925
prerequisite-patch-id: ccc166b6ad2f1c967750b06bf6ab543f22590776
prerequisite-patch-id: f05f46fc9b19b4b48114950c9c86c849e52fbfca
prerequisite-patch-id: 3c61783975dc22358e7817c8ed549334135a2d2a

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

[PATCH RFC 01/13] ARM: dts: qcom: ipq4018: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Please do not merge until corresponding driver changes hit mainline (see
cover letter).
---
 arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi | 2 +-
 arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
index a6d4390efa7c394398b9b6b067c9e64b21334cc0..be76bc39ac2774fc5eb3c0e92844eb609b01dba6 100644
--- a/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
@@ -251,7 +251,7 @@ &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
 	nvmem-cells = <&precal_art_5000>;
-	qcom,ath10k-calibration-variant = "ALFA-Network-AP120C-AC";
+	qcom,calibration-variant = "ALFA-Network-AP120C-AC";
 };
 
 &usb3_hs_phy {
diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts b/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts
index 6640ea7b6acb2f1d3002b52b25ef327cdc8a5bdd..15baaf0d1529875a804bf3662fc66bb517bc1f11 100644
--- a/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts
@@ -179,13 +179,13 @@ &mdio {
 &wifi0 {
 	status = "okay";
 
-	qcom,ath10k-calibration-variant = "8devices-Jalapeno";
+	qcom,calibration-variant = "8devices-Jalapeno";
 };
 
 &wifi1 {
 	status = "okay";
 
-	qcom,ath10k-calibration-variant = "8devices-Jalapeno";
+	qcom,calibration-variant = "8devices-Jalapeno";
 };
 
 &usb3_ss_phy {

-- 
2.43.0

[PATCH RFC 02/13] arm64: dts: qcom: msm8998: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Please do not merge until corresponding driver changes hit mainline (see
cover letter).
---
 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
index 901f6ac0084db3df02608b2e52a8e8837aad7d96..f160ba562b0af505bdc1357731f75a394b5eeeeb 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
@@ -101,5 +101,5 @@ i2c5_hid_active: i2c5-hid-active-state {
 };
 
 &wifi {
-	qcom,ath10k-calibration-variant = "Lenovo_Miix630";
+	qcom,calibration-variant = "Lenovo_Miix630";
 };

-- 
2.43.0

[PATCH RFC 03/13] arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
index 7a789b41c2f1887f0c41ae24da2e2fe8915ab13c..bef1fa782f1260e95e347abd52989d2da490af98 100644
--- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
+++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
@@ -620,7 +620,7 @@ &wifi {
 	vdd-1.8-xo-supply = <&pm4125_l13>;
 	vdd-1.3-rfa-supply = <&pm4125_l10>;
 	vdd-3.3-ch0-supply = <&pm4125_l22>;
-	qcom,ath10k-calibration-variant = "Thundercomm_RB1";
+	qcom,calibration-variant = "Thundercomm_RB1";
 	firmware-name = "qcm2290";
 	status = "okay";
 };

-- 
2.43.0

[PATCH RFC 04/13] arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index 52db18847803e3d6bc7acf34f5b9b4f0f10e8f32..d485249bcda44055689b5556eec9dd057b92d0ae 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -749,7 +749,7 @@ &wifi {
 	vdd-1.8-xo-supply = <&vreg_l16a_1p3>;
 	vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
 	vdd-3.3-ch0-supply = <&vreg_l23a_3p3>;
-	qcom,ath10k-calibration-variant = "Thundercomm_RB2";
+	qcom,calibration-variant = "Thundercomm_RB2";
 	firmware-name = "qrb4210";
 
 	status = "okay";

-- 
2.43.0

[PATCH RFC 05/13] arm64: dts: qcom: sc7180: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi    | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts   | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi       | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi  | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi      | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index f57976906d63040ee5aab7ea48702118f44824d2..8fee8d7a7d4cdc85bf7e8ec524dae5a6ec0d3e9a 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
@@ -188,7 +188,7 @@ &sound_multimedia1_codec {
 };
 
 &wifi {
-	qcom,ath10k-calibration-variant = "GO_HOMESTAR";
+	qcom,calibration-variant = "GO_HOMESTAR";
 };
 
 /* PINCTRL - modifications to sc7180-trogdor.dtsi */
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts
index 655bea928e52a42498a3e7a5ce7a2774160f3b04..26514640a1ae29e0541643b565d63ce6d5cf5396 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts
@@ -79,7 +79,7 @@ &pp3300_dx_edp {
 };
 
 &wifi {
-	qcom,ath10k-calibration-variant = "GO_KINGOFTOWN";
+	qcom,calibration-variant = "GO_KINGOFTOWN";
 };
 
 /* PINCTRL - modifications to sc7180-trogdor.dtsi */
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index c3fd6760de7a8ef0ff0e7d5cd793cac358aba798..eb9c9e713a89656467724dd731507d484d7dc86b 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -69,7 +69,7 @@ &trackpad {
 };
 
 &wifi {
-	qcom,ath10k-calibration-variant = "GO_LAZOR";
+	qcom,calibration-variant = "GO_LAZOR";
 };
 
 /* PINCTRL - modifications to sc7180-trogdor.dtsi */
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
index 89034b6702f4185d7bb20e2453b76ef65c40ccf6..a2224de841b1dcf4dad4bb8d6282abc730dbad7b 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
@@ -59,5 +59,5 @@ CROS_STD_MAIN_KEYMAP
 };
 
 &wifi {
-	qcom,ath10k-calibration-variant = "GO_PAZQUEL360";
+	qcom,calibration-variant = "GO_PAZQUEL360";
 };
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index f7300ffbb4519a7973c74198fc0f9ca2d770bc3e..4f5ab378cf8e68ecca8152170af13200716bcda3 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@ -181,7 +181,7 @@ &usb_c1 {
 };
 
 &wifi {
-	qcom,ath10k-calibration-variant = "GO_POMPOM";
+	qcom,calibration-variant = "GO_POMPOM";
 };
 
 /* PINCTRL - board-specific pinctrl */
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
index d4925be3b1fcf5219866f9754b5bff3e45d84c08..17908c93652011d69a2d04b980f45f6732f16977 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
@@ -196,7 +196,7 @@ &pp2800_wf_cam {
 };
 
 &wifi {
-	qcom,ath10k-calibration-variant = "GO_WORMDINGLER";
+	qcom,calibration-variant = "GO_WORMDINGLER";
 };
 
 /*

-- 
2.43.0

[PATCH RFC 06/13] arm64: dts: qcom: sdm845: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts           | 2 +-
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts              | 2 +-
 arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 1cc0f571e1f7f3023efa08adf2791ffce5f2fecf..89ce3f6436076e34e03e04ac41c6be520aefaca4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -1166,7 +1166,7 @@ &wifi {
 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
 
 	qcom,snoc-host-cap-8bit-quirk;
-	qcom,ath10k-calibration-variant = "Thundercomm_DB845C";
+	qcom,calibration-variant = "Thundercomm_DB845C";
 };
 
 /* PINCTRL - additions to nodes defined in sdm845.dtsi */
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 2391f842c9038a3030511a1c9c8edd31bbacf2b0..aa482e8fd9e2a85489d0ae34d3ec91286e6f07b1 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -789,7 +789,7 @@ &wifi {
 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
 
 	qcom,snoc-host-cap-8bit-quirk;
-	qcom,ath10k-calibration-variant = "Qualcomm_sdm845mtp";
+	qcom,calibration-variant = "Qualcomm_sdm845mtp";
 };
 
 /* PINCTRL - additions to nodes defined in sdm845.dtsi */
diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index f18050848cd8892666015c8182971ff0567747b7..bf45511b24b37f0df24e15e540cfc69831cccdc7 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -910,7 +910,7 @@ &wifi {
 	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
 
 	qcom,snoc-host-cap-8bit-quirk;
-	qcom,ath10k-calibration-variant = "Lenovo_C630";
+	qcom,calibration-variant = "Lenovo_C630";
 };
 
 &crypto {

-- 
2.43.0

[PATCH RFC 07/13] arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
index d402f4c85b11d17dde80d17964d1f45767645ff1..4a51076890694dc96c4a328ca1d35bff8f0fabf4 100644
--- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
+++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
@@ -507,7 +507,7 @@ &wifi {
 	vdd-3.3-ch0-supply = <&vreg_l19a_3p3>;
 	vdd-3.3-ch1-supply = <&vreg_l8b_3p3>;
 
-	qcom,ath10k-calibration-variant = "Inforce_IFC6560";
+	qcom,calibration-variant = "Inforce_IFC6560";
 
 	status = "okay";
 };

-- 
2.43.0

[PATCH RFC 08/13] arm64: dts: qcom: sm6115: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts   | 2 +-
 arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
index f60d36c03b9b51d1ba5fb2db7d619916fe42f084..ad347ccd19755b20db8e0de6852148c76010e697 100644
--- a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
@@ -566,7 +566,7 @@ &wifi {
 	vdd-1.3-rfa-supply = <&pm6125_l17a>;
 	vdd-3.3-ch0-supply = <&pm6125_l23a>;
 
-	qcom,ath10k-calibration-variant = "Fxtec_QX1050";
+	qcom,calibration-variant = "Fxtec_QX1050";
 
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index 9d78bb3f71901705fd22d88b472f6fc1d0c0fffb..c17545111f49a8388d8d5802ea5c3ff3c8a6cb45 100644
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -379,7 +379,7 @@ &wifi {
 	vdd-1.8-xo-supply = <&pm6125_l16>;
 	vdd-1.3-rfa-supply = <&pm6125_l17>;
 	vdd-3.3-ch0-supply = <&pm6125_l23>;
-	qcom,ath10k-calibration-variant = "Lenovo_P11";
+	qcom,calibration-variant = "Lenovo_P11";
 	status = "okay";
 };
 

-- 
2.43.0

[PATCH RFC 09/13] arm64: dts: qcom: sm8150-hdk: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath10k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
index 6ea883b1edfa6c511730550f4db0cb9c25fc633d..9ac9854b35fd157e0735aaff4e0bdbaa8946e0d5 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
@@ -719,5 +719,5 @@ &wifi {
 	vdd-1.3-rfa-supply = <&vreg_l2c_1p3>;
 	vdd-3.3-ch0-supply = <&vreg_l11c_3p3>;
 
-	qcom,ath10k-calibration-variant = "Qualcomm_sm8150hdk";
+	qcom,calibration-variant = "Qualcomm_sm8150hdk";
 };

-- 
2.43.0

[PATCH RFC 10/13] arm64: dts: qcom: qcm6490: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath11k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 2 +-
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts           | 2 +-
 arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts   | 2 +-
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
index 769c66cb5d19dbf50e137b3a72de2e36ec4daecf..d12ce8ed43f0af50d751c45cdac383247b44fa84 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
@@ -1190,6 +1190,6 @@ &venus {
 };
 
 &wifi {
-	qcom,ath11k-calibration-variant = "Fairphone_5";
+	qcom,calibration-variant = "Fairphone_5";
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index 9209efcc49b57a853c4dd55ac52cd4dc98d7fe86..f26c5c2fde6b81863661873fccc7c3dabb198585 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -755,7 +755,7 @@ &usb_1_qmpphy {
 
 &wifi {
 	memory-region = <&wlan_fw_mem>;
-	qcom,ath11k-calibration-variant = "Qualcomm_qcm6490idp";
+	qcom,calibration-variant = "Qualcomm_qcm6490idp";
 
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
index 75930f95769663f6ac3e2dd0c5f7d224085dda40..712f29fbe85e596f35f0fec350308d89070ef0da 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
@@ -953,7 +953,7 @@ &usb_1_qmpphy {
 };
 
 &wifi {
-	qcom,ath11k-calibration-variant = "SHIFTphone_8";
+	qcom,calibration-variant = "SHIFTphone_8";
 
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 7a36c90ad4ec8b52f30b22b1621404857d6ef336..0729168d40b0b8652beeff8b5accc11c09f8fbf4 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -919,7 +919,7 @@ &venus {
 
 &wifi {
 	memory-region = <&wlan_fw_mem>;
-	qcom,ath11k-calibration-variant = "Qualcomm_rb3gen2";
+	qcom,calibration-variant = "Qualcomm_rb3gen2";
 
 	status = "okay";
 };

-- 
2.43.0

[PATCH RFC 11/13] arm64: dts: qcom: sa8775p-ride: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath11k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi b/arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi
index 175f8b1e3b2ded15fc3265ac8c26b14473b618f6..fd841adc7791042f9cc6e3fdb76d250c7cbb6a0a 100644
--- a/arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi
+++ b/arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi
@@ -878,7 +878,7 @@ wifi@0 {
 		compatible = "pci17cb,1101";
 		reg = <0x10000 0x0 0x0 0x0 0x0>;
 
-		qcom,ath11k-calibration-variant = "QC_SA8775P_Ride";
+		qcom,calibration-variant = "QC_SA8775P_Ride";
 
 		vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
 		vddaon-supply = <&vreg_pmu_aon_0p59>;

-- 
2.43.0

[PATCH RFC 12/13] arm64: dts: qcom: sc8280xp: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath11k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts                  | 2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts     | 2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 75adaa19d1c3e0c8fcad40c7d0b0afb504331d75..e7251b76d91e71e94029acd765b927035c2b38e6 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -686,7 +686,7 @@ wifi@0 {
 		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
 		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
 
-		qcom,ath11k-calibration-variant = "QC_8280XP_CRD";
+		qcom,calibration-variant = "QC_8280XP_CRD";
 	};
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index f3190f408f4b2c7ca9fe368d652d5d66bb3949af..6ddb954a04fd611709a8a241b16f85b589efb691 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -998,7 +998,7 @@ wifi@0 {
 		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
 		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
 
-		qcom,ath11k-calibration-variant = "LE_X13S";
+		qcom,calibration-variant = "LE_X13S";
 	};
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
index ae5daeac8fe284bbec86622c10e6831d60a25297..d00889fa6f0bac01d326dca9801c66a508ff1d67 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
@@ -536,7 +536,7 @@ wifi@0 {
 		compatible = "pci17cb,1103";
 		reg = <0x10000 0x0 0x0 0x0 0x0>;
 
-		qcom,ath11k-calibration-variant = "MS_SP9_5G";
+		qcom,calibration-variant = "MS_SP9_5G";
 	};
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
index fa9d9410505226f70c1b1283a7360bf3a56e8c4f..812251324002b50f3b48845b6c244f692d42b9b2 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
@@ -670,7 +670,7 @@ wifi@0 {
 		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
 		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
 
-		qcom,ath11k-calibration-variant = "MS_Volterra";
+		qcom,calibration-variant = "MS_Volterra";
 	};
 };
 

-- 
2.43.0

[PATCH RFC 13/13] arm64: dts: qcom: sm8250-elish: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

The property qcom,ath11k-calibration-variant was deprecated in favor of
recently introduced generic qcom,calibration-variant, common to all
Qualcomm Atheros WiFi bindings.

Change will affect out of tree users, like other projects, of this DTS.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index 813b009b7bd6818b92b243f0982d2c7ef903d421..01a321d801af3389258abd54e60c39272c59fb7e 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -699,7 +699,7 @@ wifi@0 {
 		vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
 		vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
 
-		qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro";
+		qcom,calibration-variant = "Xiaomi_Pad_5Pro";
 	};
 };
 

-- 
2.43.0

Re: [PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Konrad Dybcio]

On 25.02.2025 10:58 AM, Krzysztof Kozlowski wrote:
> Dependency
> ==========
> RFC, because this should be merged release after driver support is
> merged:
> https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t
> 
> Change will affect out of tree users, like other projects, of this DTS.

That's a good cleanup, too bad nobody thought of that before

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Bjorn Andersson]

On Tue, 25 Feb 2025 10:58:57 +0100, Krzysztof Kozlowski wrote:
> Dependency
> ==========
> RFC, because this should be merged release after driver support is
> merged:
> https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t
> 
> Change will affect out of tree users, like other projects, of this DTS.
> 
> [...]

Applied, thanks!

[01/13] ARM: dts: qcom: ipq4018: Switch to undeprecated qcom,calibration-variant
        commit: adbbdcf4b2d6556721b580385ba387baca5c26ee
[02/13] arm64: dts: qcom: msm8998: Switch to undeprecated qcom,calibration-variant
        commit: f1bf8a943bea70c7432731c11761d161882aeedc
[03/13] arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated qcom,calibration-variant
        commit: 41eeff2fc2292c56592206741b05fde63acef4f0
[04/13] arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated qcom,calibration-variant
        commit: a83356f7ba575f536dd2bf2338cafd0d1d2d51ec
[05/13] arm64: dts: qcom: sc7180: Switch to undeprecated qcom,calibration-variant
        commit: 4f8fc2038b3ce9fa1fd52491e774e43bf5e67547
[06/13] arm64: dts: qcom: sdm845: Switch to undeprecated qcom,calibration-variant
        commit: 218718e0c2536bc17c1a10eed35e99100bed5b46
[07/13] arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated qcom,calibration-variant
        commit: 020ec05884e97175a181b33eb60d556ceaa32de8
[08/13] arm64: dts: qcom: sm6115: Switch to undeprecated qcom,calibration-variant
        commit: d39d4fd49337be1e8f6c28e4d31344a2124acb57
[09/13] arm64: dts: qcom: sm8150-hdk: Switch to undeprecated qcom,calibration-variant
        commit: b187df5a0224d2e1b5ab8ea19c98d6ebbe554fe8
[10/13] arm64: dts: qcom: qcm6490: Switch to undeprecated qcom,calibration-variant
        commit: cfbcd6d483dc7203db230cb24c9ee286033682fa
[11/13] arm64: dts: qcom: sa8775p-ride: Switch to undeprecated qcom,calibration-variant
        commit: fda76284e9b4c4606758fb62cfd81dd57e8f2516
[12/13] arm64: dts: qcom: sc8280xp: Switch to undeprecated qcom,calibration-variant
        commit: d12ce84c88013cd4ea770d244d44362f691e1690
[13/13] arm64: dts: qcom: sm8250-elish: Switch to undeprecated qcom,calibration-variant
        commit: 37eb85ae550004790c98605762c2e0326a82e160

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Dmitry Baryshkov]

On Tue, Mar 04, 2025 at 11:00:10AM -0600, Bjorn Andersson wrote:
> 
> On Tue, 25 Feb 2025 10:58:57 +0100, Krzysztof Kozlowski wrote:
> > Dependency
> > ==========
> > RFC, because this should be merged release after driver support is
> > merged:
> > https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t
> > 
> > Change will affect out of tree users, like other projects, of this DTS.
> > 
> > [...]
> 
> Applied, thanks!

Applying it too early might break WiFi on those boards. I think
Krzysztof explicitly asked for it to be merged in +1 release, when the
driver changes are in.

> 
> [01/13] ARM: dts: qcom: ipq4018: Switch to undeprecated qcom,calibration-variant
>         commit: adbbdcf4b2d6556721b580385ba387baca5c26ee
> [02/13] arm64: dts: qcom: msm8998: Switch to undeprecated qcom,calibration-variant
>         commit: f1bf8a943bea70c7432731c11761d161882aeedc
> [03/13] arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated qcom,calibration-variant
>         commit: 41eeff2fc2292c56592206741b05fde63acef4f0
> [04/13] arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated qcom,calibration-variant
>         commit: a83356f7ba575f536dd2bf2338cafd0d1d2d51ec
> [05/13] arm64: dts: qcom: sc7180: Switch to undeprecated qcom,calibration-variant
>         commit: 4f8fc2038b3ce9fa1fd52491e774e43bf5e67547
> [06/13] arm64: dts: qcom: sdm845: Switch to undeprecated qcom,calibration-variant
>         commit: 218718e0c2536bc17c1a10eed35e99100bed5b46
> [07/13] arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated qcom,calibration-variant
>         commit: 020ec05884e97175a181b33eb60d556ceaa32de8
> [08/13] arm64: dts: qcom: sm6115: Switch to undeprecated qcom,calibration-variant
>         commit: d39d4fd49337be1e8f6c28e4d31344a2124acb57
> [09/13] arm64: dts: qcom: sm8150-hdk: Switch to undeprecated qcom,calibration-variant
>         commit: b187df5a0224d2e1b5ab8ea19c98d6ebbe554fe8
> [10/13] arm64: dts: qcom: qcm6490: Switch to undeprecated qcom,calibration-variant
>         commit: cfbcd6d483dc7203db230cb24c9ee286033682fa
> [11/13] arm64: dts: qcom: sa8775p-ride: Switch to undeprecated qcom,calibration-variant
>         commit: fda76284e9b4c4606758fb62cfd81dd57e8f2516
> [12/13] arm64: dts: qcom: sc8280xp: Switch to undeprecated qcom,calibration-variant
>         commit: d12ce84c88013cd4ea770d244d44362f691e1690
> [13/13] arm64: dts: qcom: sm8250-elish: Switch to undeprecated qcom,calibration-variant
>         commit: 37eb85ae550004790c98605762c2e0326a82e160
> 
> Best regards,
> -- 
> Bjorn Andersson <andersson@kernel.org>

-- 
With best wishes
Dmitry

Re: [PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

On 04/03/2025 21:50, Dmitry Baryshkov wrote:
> On Tue, Mar 04, 2025 at 11:00:10AM -0600, Bjorn Andersson wrote:
>>
>> On Tue, 25 Feb 2025 10:58:57 +0100, Krzysztof Kozlowski wrote:
>>> Dependency
>>> ==========
>>> RFC, because this should be merged release after driver support is
>>> merged:
>>> https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t
>>>
>>> Change will affect out of tree users, like other projects, of this DTS.
>>>
>>> [...]
>>
>> Applied, thanks!
> 
> Applying it too early might break WiFi on those boards. I think

It is just non-bisectable, so that's why I put above remark.

> Krzysztof explicitly asked for it to be merged in +1 release, when the
> driver changes are in.

Yeah, that was the point.


Best regards,
Krzysztof

Re: [PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Jeff Johnson]

On 3/4/2025 10:48 PM, Krzysztof Kozlowski wrote:
> On 04/03/2025 21:50, Dmitry Baryshkov wrote:
>> On Tue, Mar 04, 2025 at 11:00:10AM -0600, Bjorn Andersson wrote:
>>>
>>> On Tue, 25 Feb 2025 10:58:57 +0100, Krzysztof Kozlowski wrote:
>>>> Dependency
>>>> ==========
>>>> RFC, because this should be merged release after driver support is
>>>> merged:
>>>> https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t
>>>>
>>>> Change will affect out of tree users, like other projects, of this DTS.
>>>>
>>>> [...]
>>>
>>> Applied, thanks!
>>
>> Applying it too early might break WiFi on those boards. I think
> 
> It is just non-bisectable, so that's why I put above remark.
> 
>> Krzysztof explicitly asked for it to be merged in +1 release, when the
>> driver changes are in.
> 
> Yeah, that was the point.

Driver changes are already in linux-next, and I've sent the pull request to
linux-wireless to hopefully have those changes land in the 6.15 merge window.
(ath => wireless => net => Linus)

/jeff

Re: [PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Dmitry Baryshkov]

On Thu, 6 Mar 2025 at 19:16, Jeff Johnson <jeff.johnson@oss.qualcomm.com> wrote:
>
> On 3/4/2025 10:48 PM, Krzysztof Kozlowski wrote:
> > On 04/03/2025 21:50, Dmitry Baryshkov wrote:
> >> On Tue, Mar 04, 2025 at 11:00:10AM -0600, Bjorn Andersson wrote:
> >>>
> >>> On Tue, 25 Feb 2025 10:58:57 +0100, Krzysztof Kozlowski wrote:
> >>>> Dependency
> >>>> ==========
> >>>> RFC, because this should be merged release after driver support is
> >>>> merged:
> >>>> https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t
> >>>>
> >>>> Change will affect out of tree users, like other projects, of this DTS.
> >>>>
> >>>> [...]
> >>>
> >>> Applied, thanks!
> >>
> >> Applying it too early might break WiFi on those boards. I think
> >
> > It is just non-bisectable, so that's why I put above remark.
> >
> >> Krzysztof explicitly asked for it to be merged in +1 release, when the
> >> driver changes are in.
> >
> > Yeah, that was the point.
>
> Driver changes are already in linux-next, and I've sent the pull request to
> linux-wireless to hopefully have those changes land in the 6.15 merge window.
> (ath => wireless => net => Linus)

But if anything, bisecting over Bjorn's tree might give strange results.


-- 
With best wishes
Dmitry

Re: [PATCH RFC 00/13] arm: dts: qcom: Switch to undeprecated qcom,calibration-variant

[Krzysztof Kozlowski]

On 25/02/2025 10:58, Krzysztof Kozlowski wrote:
> Dependency
> ==========
> RFC, because this should be merged release after driver support is
> merged:
> https://lore.kernel.org/linux-devicetree/20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org/T/#t
> 
> Change will affect out of tree users, like other projects, of this DTS.
> 
> Description
> ===========
> The property qcom,ath10k/11k-calibration-variant was deprecated in favor
> of recently introduced generic qcom,calibration-variant, common to all
> Qualcomm Atheros WiFi bindings.

Above changes were merged to mainline, thus patchset is safe now to be
applied (as far as Linux is concerned).

Best regards,
Krzysztof