[PATCH 0/3] arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth

[PATCH 0/3] arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth

[Bartosz Golaszewski]

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

This enables WLAN and Bluetooth on two boards using the sc8280xp SoC.
For the sc8280xp-crd we add the PMU, wifi and bluetooth nodes with the
correctly modelled wiring between them. For the X13s, we rework existing
nodes so that they align with the new DT bindings contract.

Bartosz Golaszewski (2):
  arm64: dts: qcom: sc8280xp-crd: enable bluetooth
  arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855

Konrad Dybcio (1):
  arm64: dts: qcom: sc8280xp-crd: enable wifi

 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     | 169 ++++++++++++++++++
 .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  98 ++++++++--
 2 files changed, 255 insertions(+), 12 deletions(-)

-- 
2.43.0

[PATCH 1/3] arm64: dts: qcom: sc8280xp-crd: enable wifi

[Bartosz Golaszewski]

From: Konrad Dybcio <konradybcio@kernel.org>

Add nodes for the WCN6855 PMU, the WLAN module and relevant regulators
and pin functions to enable wifi support on sc8280xp-crd.

Signed-off-by: Konrad Dybcio <konradybcio@kernel.org>
[Bartosz:
  - write the commit message,
  - rebase Konrad's commit,
  - fix one of the supplies' name]
Co-developed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 112 ++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 6020582b0a59..57efeefbc89e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -177,6 +177,17 @@ vreg_misc_3p3: regulator-misc-3p3 {
 		regulator-always-on;
 	};
 
+	vreg_s10b: regulator-s10b {
+		compatible = "regulator-fixed";
+
+		regulator-name = "VREG_S10B";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
 	vreg_wlan: regulator-wlan {
 		compatible = "regulator-fixed";
 
@@ -260,6 +271,67 @@ usb1_sbu_mux: endpoint {
 			};
 		};
 	};
+
+	wcn6855-pmu {
+		compatible = "qcom,wcn6855-pmu";
+
+		pinctrl-0 = <&wlan_en>;
+		pinctrl-names = "default";
+
+		wlan-enable-gpios = <&tlmm 134 GPIO_ACTIVE_HIGH>;
+		bt-enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>;
+
+		vddio-supply = <&vreg_s10b>;
+		vddaon-supply = <&vreg_s12b>;
+		vddpmu-supply = <&vreg_s12b>;
+		vddrfa0p95-supply = <&vreg_s12b>;
+		vddrfa1p3-supply = <&vreg_s11b>;
+		vddrfa1p9-supply = <&vreg_s1c>;
+		vddpcie1p3-supply = <&vreg_s11b>;
+		vddpcie1p9-supply = <&vreg_s1c>;
+
+		regulators {
+			vreg_pmu_rfa_cmn_0p8: ldo0 {
+				regulator-name = "vreg_pmu_rfa_cmn_0p8";
+			};
+
+			vreg_pmu_aon_0p8: ldo1 {
+				regulator-name = "vreg_pmu_aon_0p8";
+			};
+
+			vreg_pmu_wlcx_0p8: ldo2 {
+				regulator-name = "vreg_pmu_wlcx_0p8";
+			};
+
+			vreg_pmu_wlmx_0p8: ldo3 {
+				regulator-name = "vreg_pmu_wlmx_0p8";
+			};
+
+			vreg_pmu_btcmx_0p8: ldo4 {
+				regulator-name = "vreg_pmu_btcmx_0p8";
+			};
+
+			vreg_pmu_pcie_1p8: ldo5 {
+				regulator-name = "vreg_pmu_pcie_1p8";
+			};
+
+			vreg_pmu_pcie_0p9: ldo6 {
+				regulator-name = "vreg_pmu_pcie_0p9";
+			};
+
+			vreg_pmu_rfa_0p8: ldo7 {
+				regulator-name = "vreg_pmu_rfa_0p8";
+			};
+
+			vreg_pmu_rfa_1p2: ldo8 {
+				regulator-name = "vreg_pmu_rfa_1p2";
+			};
+
+			vreg_pmu_rfa_1p7: ldo9 {
+				regulator-name = "vreg_pmu_rfa_1p7";
+			};
+		};
+	};
 };
 
 &apps_rsc {
@@ -276,6 +348,13 @@ vreg_s11b: smps11 {
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
+		vreg_s12b: smps12 {
+			regulator-name = "vreg_s12b";
+			regulator-min-microvolt = <984000>;
+			regulator-max-microvolt = <984000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+
 		vreg_l3b: ldo3 {
 			regulator-name = "vreg_l3b";
 			regulator-min-microvolt = <1200000>;
@@ -304,6 +383,13 @@ regulators-1 {
 		compatible = "qcom,pm8350c-rpmh-regulators";
 		qcom,pmic-id = "c";
 
+		vreg_s1c: smps1 {
+			regulator-name = "vreg_s1c";
+			regulator-min-microvolt = <1888000>;
+			regulator-max-microvolt = <1888000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+
 		vreg_l1c: ldo1 {
 			regulator-name = "vreg_l1c";
 			regulator-min-microvolt = <1800000>;
@@ -583,6 +669,25 @@ &pcie4_phy {
 	status = "okay";
 };
 
+&pcie4_port0 {
+	wifi@0 {
+		compatible = "pci17cb,1103";
+		reg = <0x10000 0x0 0x0 0x0 0x0>;
+
+		vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;
+		vddaon-supply = <&vreg_pmu_aon_0p8>;
+		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
+		vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;
+		vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
+		vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
+		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
+		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
+		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
+
+		qcom,ath11k-calibration-variant = "LE_X13S";
+	};
+};
+
 &pmc8280c_lpg {
 	status = "okay";
 };
@@ -829,6 +934,13 @@ reset-pins {
 		};
 	};
 
+	wlan_en: wlan-en-state {
+		pins = "gpio134";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-down;
+	};
+
 	nvme_reg_en: nvme-reg-en-state {
 		pins = "gpio135";
 		function = "gpio";
-- 
2.43.0

Re: [PATCH 1/3] arm64: dts: qcom: sc8280xp-crd: enable wifi

[Johan Hovold]

On Tue, Aug 13, 2024 at 09:06:36PM +0200, Bartosz Golaszewski wrote:
> From: Konrad Dybcio <konradybcio@kernel.org>
> 
> Add nodes for the WCN6855 PMU, the WLAN module and relevant regulators
> and pin functions to enable wifi support on sc8280xp-crd.

What are you guys smoking? The Wi-Fi has been enabled on the CRD since
6.2 and commit d907fe5acbf1 ("arm64: dts: qcom: sc8280xp-crd: enable
WiFi controller").

> Signed-off-by: Konrad Dybcio <konradybcio@kernel.org>
> [Bartosz:
>   - write the commit message,
>   - rebase Konrad's commit,
>   - fix one of the supplies' name]
> Co-developed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 112 ++++++++++++++++++++++
>  1 file changed, 112 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> index 6020582b0a59..57efeefbc89e 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
> @@ -177,6 +177,17 @@ vreg_misc_3p3: regulator-misc-3p3 {
>  		regulator-always-on;
>  	};
>  
> +	vreg_s10b: regulator-s10b {
> +		compatible = "regulator-fixed";

I don't think this is a fixed regulator.

> +
> +		regulator-name = "VREG_S10B";
> +		regulator-min-microvolt = <1800000>;
> +		regulator-max-microvolt = <1800000>;
> +
> +		regulator-always-on;
> +		regulator-boot-on;
> +	};
> +
>  	vreg_wlan: regulator-wlan {
>  		compatible = "regulator-fixed";
>  
 
> +&pcie4_port0 {
> +	wifi@0 {
> +		compatible = "pci17cb,1103";
> +		reg = <0x10000 0x0 0x0 0x0 0x0>;
> +
> +		vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;
> +		vddaon-supply = <&vreg_pmu_aon_0p8>;
> +		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
> +		vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;
> +		vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
> +		vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
> +		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
> +		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
> +		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
> +
> +		qcom,ath11k-calibration-variant = "LE_X13S";

This is not the right calibration variant either. In fact, Qualcomm has
not yet released any calibration data for this CRD yet:

	https://bugzilla.kernel.org/show_bug.cgi?id=216036

I use a patch like this locally, but we shouldn't merge this upstream.
 
> +	wlan_en: wlan-en-state {
> +		pins = "gpio134";
> +		function = "gpio";
> +		drive-strength = <8>;

Why increase the drive strength?

> +		bias-pull-down;
> +	};

Johan

Re: [PATCH 1/3] arm64: dts: qcom: sc8280xp-crd: enable wifi

[Konrad Dybcio]

On 22.08.2024 4:56 PM, Johan Hovold wrote:
> On Tue, Aug 13, 2024 at 09:06:36PM +0200, Bartosz Golaszewski wrote:
>> From: Konrad Dybcio <konradybcio@kernel.org>
>>
>> Add nodes for the WCN6855 PMU, the WLAN module and relevant regulators
>> and pin functions to enable wifi support on sc8280xp-crd.
> 
> What are you guys smoking? The Wi-Fi has been enabled on the CRD since
> 6.2 and commit d907fe5acbf1 ("arm64: dts: qcom: sc8280xp-crd: enable
> WiFi controller").

Smells like copypasta..

> 
>> Signed-off-by: Konrad Dybcio <konradybcio@kernel.org>
>> [Bartosz:
>>   - write the commit message,
>>   - rebase Konrad's commit,
>>   - fix one of the supplies' name]
>> Co-developed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>> ---
>>  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 112 ++++++++++++++++++++++
>>  1 file changed, 112 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
>> index 6020582b0a59..57efeefbc89e 100644
>> --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
>> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
>> @@ -177,6 +177,17 @@ vreg_misc_3p3: regulator-misc-3p3 {
>>  		regulator-always-on;
>>  	};
>>  
>> +	vreg_s10b: regulator-s10b {
>> +		compatible = "regulator-fixed";
> 
> I don't think this is a fixed regulator.

It effectively is

> 
>> +
>> +		regulator-name = "VREG_S10B";
>> +		regulator-min-microvolt = <1800000>;
>> +		regulator-max-microvolt = <1800000>;
>> +
>> +		regulator-always-on;
>> +		regulator-boot-on;
>> +	};
>> +
>>  	vreg_wlan: regulator-wlan {
>>  		compatible = "regulator-fixed";
>>  
>  
>> +&pcie4_port0 {
>> +	wifi@0 {
>> +		compatible = "pci17cb,1103";
>> +		reg = <0x10000 0x0 0x0 0x0 0x0>;
>> +
>> +		vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;
>> +		vddaon-supply = <&vreg_pmu_aon_0p8>;
>> +		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
>> +		vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;
>> +		vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
>> +		vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
>> +		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
>> +		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
>> +		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
>> +
>> +		qcom,ath11k-calibration-variant = "LE_X13S";
> 
> This is not the right calibration variant either. In fact, Qualcomm has
> not yet released any calibration data for this CRD yet:
> 
> 	https://bugzilla.kernel.org/show_bug.cgi?id=216036
> 
> I use a patch like this locally, but we shouldn't merge this upstream.

Agreed

>  
>> +	wlan_en: wlan-en-state {
>> +		pins = "gpio134";
>> +		function = "gpio";
>> +		drive-strength = <8>;
> 
> Why increase the drive strength?

This is what's used on Windows, for lack of a better idea, not sure
if this is actually necessary

Konrad

Re: [PATCH 1/3] arm64: dts: qcom: sc8280xp-crd: enable wifi

[Johan Hovold]

On Tue, Aug 27, 2024 at 01:26:40PM +0200, Konrad Dybcio wrote:
> On 22.08.2024 4:56 PM, Johan Hovold wrote:
> > On Tue, Aug 13, 2024 at 09:06:36PM +0200, Bartosz Golaszewski wrote:
> >> From: Konrad Dybcio <konradybcio@kernel.org>

> >> +	vreg_s10b: regulator-s10b {
> >> +		compatible = "regulator-fixed";
> > 
> > I don't think this is a fixed regulator.
> 
> It effectively is

If it's an output of one of the pmic as the name suggests and as it is
on the X13s, I think it should be described as such.
 
> >> +
> >> +		regulator-name = "VREG_S10B";
> >> +		regulator-min-microvolt = <1800000>;
> >> +		regulator-max-microvolt = <1800000>;
> >> +
> >> +		regulator-always-on;
> >> +		regulator-boot-on;
> >> +	};
 
> >> +	wlan_en: wlan-en-state {
> >> +		pins = "gpio134";
> >> +		function = "gpio";
> >> +		drive-strength = <8>;
> > 
> > Why increase the drive strength?
> 
> This is what's used on Windows, for lack of a better idea, not sure
> if this is actually necessary

If this indeed is what the fw configures it as then I guess it's fine to
keep as-is for now.

Johan

[PATCH 2/3] arm64: dts: qcom: sc8280xp-crd: enable bluetooth

[Bartosz Golaszewski]

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

Add the bluetooth node for sc8280xp-crd and make it consume the outputs
from the PMU as per the new DT bindings contract.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 59 ++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 57efeefbc89e..7bd7cd310bf0 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -20,6 +20,7 @@ aliases {
 		i2c4 = &i2c4;
 		i2c21 = &i2c21;
 		serial0 = &uart17;
+		serial1 = &uart2;
 	};
 
 	backlight: backlight {
@@ -275,7 +276,7 @@ usb1_sbu_mux: endpoint {
 	wcn6855-pmu {
 		compatible = "qcom,wcn6855-pmu";
 
-		pinctrl-0 = <&wlan_en>;
+		pinctrl-0 = <&bt_en>, <&wlan_en>;
 		pinctrl-names = "default";
 
 		wlan-enable-gpios = <&tlmm 134 GPIO_ACTIVE_HIGH>;
@@ -748,6 +749,27 @@ &sdc2 {
 	status = "okay";
 };
 
+&uart2 {
+	pinctrl-0 = <&uart2_default>;
+	pinctrl-names = "default";
+
+	status = "okay";
+
+	bluetooth {
+		compatible = "qcom,wcn6855-bt";
+
+		vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;
+		vddaon-supply = <&vreg_pmu_aon_0p8>;
+		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
+		vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;
+		vddbtcmx-supply = <&vreg_pmu_btcmx_0p8>;
+		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
+		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
+		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
+	};
+};
+
+
 &uart17 {
 	compatible = "qcom,geni-debug-uart";
 
@@ -893,6 +915,13 @@ hastings_reg_en: hastings-reg-en-state {
 &tlmm {
 	gpio-reserved-ranges = <74 6>, <83 4>, <125 2>, <128 2>, <154 7>;
 
+	bt_en: bt-en-state {
+		pins = "gpio133";
+		function = "gpio";
+		drive-strength = <16>;
+		bias-disable;
+	};
+
 	edp_reg_en: edp-reg-en-state {
 		pins = "gpio25";
 		function = "gpio";
@@ -1093,6 +1122,34 @@ reset-n-pins {
 		};
 	};
 
+	uart2_default: uart2-default-state {
+		cts-pins {
+			pins = "gpio121";
+			function = "qup2";
+			bias-bus-hold;
+		};
+
+		rts-pins {
+			pins = "gpio122";
+			function = "qup2";
+			drive-strength = <2>;
+			bias-disable;
+		};
+
+		rx-pins {
+			pins = "gpio124";
+			function = "qup2";
+			bias-pull-up;
+		};
+
+		tx-pins {
+			pins = "gpio123";
+			function = "qup2";
+			drive-strength = <2>;
+			bias-disable;
+		};
+	};
+
 	usb0_sbu_default: usb0-sbu-state {
 		oe-n-pins {
 			pins = "gpio101";
-- 
2.43.0

[PATCH 3/3] arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855

[Bartosz Golaszewski]

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

Add a node for the PMU of the WCN6855 and rework the inputs of the wifi
and bluetooth nodes to consume the PMU's outputs.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
 .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    | 98 ++++++++++++++++---
 1 file changed, 86 insertions(+), 12 deletions(-)

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 a7c5a3f5926c..9a68f3f4e18e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -400,6 +400,67 @@ usb1_sbu_mux: endpoint {
 			};
 		};
 	};
+
+	wcn6855-pmu {
+		compatible = "qcom,wcn6855-pmu";
+
+		pinctrl-0 = <&wlan_en>;
+		pinctrl-names = "default";
+
+		wlan-enable-gpios = <&tlmm 134 GPIO_ACTIVE_HIGH>;
+		bt-enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>;
+
+		vddio-supply = <&vreg_s10b>;
+		vddaon-supply = <&vreg_s12b>;
+		vddpmu-supply = <&vreg_s12b>;
+		vddrfa0p95-supply = <&vreg_s12b>;
+		vddrfa1p3-supply = <&vreg_s11b>;
+		vddrfa1p9-supply = <&vreg_s1c>;
+		vddpcie1p3-supply = <&vreg_s11b>;
+		vddpcie1p9-supply = <&vreg_s1c>;
+
+		regulators {
+			vreg_pmu_rfa_cmn_0p8: ldo0 {
+				regulator-name = "vreg_pmu_rfa_cmn_0p8";
+			};
+
+			vreg_pmu_aon_0p8: ldo1 {
+				regulator-name = "vreg_pmu_aon_0p8";
+			};
+
+			vreg_pmu_wlcx_0p8: ldo2 {
+				regulator-name = "vreg_pmu_wlcx_0p8";
+			};
+
+			vreg_pmu_wlmx_0p8: ldo3 {
+				regulator-name = "vreg_pmu_wlmx_0p8";
+			};
+
+			vreg_pmu_btcmx_0p8: ldo4 {
+				regulator-name = "vreg_pmu_btcmx_0p8";
+			};
+
+			vreg_pmu_pcie_1p8: ldo5 {
+				regulator-name = "vreg_pmu_pcie_1p8";
+			};
+
+			vreg_pmu_pcie_0p9: ldo6 {
+				regulator-name = "vreg_pmu_pcie_0p9";
+			};
+
+			vreg_pmu_rfa_0p8: ldo7 {
+				regulator-name = "vreg_pmu_rfa_0p8";
+			};
+
+			vreg_pmu_rfa_1p2: ldo8 {
+				regulator-name = "vreg_pmu_rfa_1p2";
+			};
+
+			vreg_pmu_rfa_1p7: ldo9 {
+				regulator-name = "vreg_pmu_rfa_1p7";
+			};
+		};
+	};
 };
 
 &apps_rsc {
@@ -876,6 +937,16 @@ wifi@0 {
 		compatible = "pci17cb,1103";
 		reg = <0x10000 0x0 0x0 0x0 0x0>;
 
+		vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;
+		vddaon-supply = <&vreg_pmu_aon_0p8>;
+		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
+		vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;
+		vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
+		vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
+		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
+		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
+		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
+
 		qcom,ath11k-calibration-variant = "LE_X13S";
 	};
 };
@@ -1207,20 +1278,16 @@ &uart2 {
 	bluetooth {
 		compatible = "qcom,wcn6855-bt";
 
-		vddio-supply = <&vreg_s10b>;
-		vddbtcxmx-supply = <&vreg_s12b>;
-		vddrfacmn-supply = <&vreg_s12b>;
-		vddrfa0p8-supply = <&vreg_s12b>;
-		vddrfa1p2-supply = <&vreg_s11b>;
-		vddrfa1p7-supply = <&vreg_s1c>;
+		vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;
+		vddaon-supply = <&vreg_pmu_aon_0p8>;
+		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
+		vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;
+		vddbtcmx-supply = <&vreg_pmu_btcmx_0p8>;
+		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
+		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
+		vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
 
 		max-speed = <3200000>;
-
-		enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>;
-		swctrl-gpios = <&tlmm 132 GPIO_ACTIVE_HIGH>;
-
-		pinctrl-0 = <&bt_default>;
-		pinctrl-names = "default";
 	};
 };
 
@@ -1694,4 +1761,11 @@ reset-pins {
 			bias-disable;
 		};
 	};
+
+	wlan_en: wlan-en-state {
+		pins = "gpio134";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-down;
+	};
 };
-- 
2.43.0

Re: [PATCH 0/3] arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth

[Steev Klimaszewski]

Hi Bartosz,

On Tue, Aug 13, 2024 at 2:07 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
> This enables WLAN and Bluetooth on two boards using the sc8280xp SoC.
> For the sc8280xp-crd we add the PMU, wifi and bluetooth nodes with the
> correctly modelled wiring between them. For the X13s, we rework existing
> nodes so that they align with the new DT bindings contract.
>
> Bartosz Golaszewski (2):
>   arm64: dts: qcom: sc8280xp-crd: enable bluetooth
>   arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855
>
> Konrad Dybcio (1):
>   arm64: dts: qcom: sc8280xp-crd: enable wifi
>
>  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     | 169 ++++++++++++++++++
>  .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  98 ++++++++--
>  2 files changed, 255 insertions(+), 12 deletions(-)
>
> --
> 2.43.0
>
>
What does this patchset depend on?  I'm assuming I'm missing something
in my config as I've tried to test this patchset and I end up with the
wifi and bluetooth being deferred on my Thinkpad X13s

[   18.655330] pci 0006:01:00.0: deferred probe pending: pci: wait for
supplier /wcn6855-pmu/regulators/ldo9
[   18.655347] serial serial0-0: deferred probe pending: serial: wait
for supplier /wcn6855-pmu/regulators/ldo9
steev@finn:~$ sudo cat /sys/kernel/debug/devices_deferred
0006:01:00.0    pci: wait for supplier /wcn6855-pmu/regulators/ldo9
serial0-0    serial: wait for supplier /wcn6855-pmu/regulators/ldo9

Re: [PATCH 0/3] arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth

[Bartosz Golaszewski]

On Tue, Aug 13, 2024 at 10:12 PM Steev Klimaszewski <steev@kali.org> wrote:
>
> Hi Bartosz,
>
> On Tue, Aug 13, 2024 at 2:07 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> >
> > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> >
> > This enables WLAN and Bluetooth on two boards using the sc8280xp SoC.
> > For the sc8280xp-crd we add the PMU, wifi and bluetooth nodes with the
> > correctly modelled wiring between them. For the X13s, we rework existing
> > nodes so that they align with the new DT bindings contract.
> >
> > Bartosz Golaszewski (2):
> >   arm64: dts: qcom: sc8280xp-crd: enable bluetooth
> >   arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855
> >
> > Konrad Dybcio (1):
> >   arm64: dts: qcom: sc8280xp-crd: enable wifi
> >
> >  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     | 169 ++++++++++++++++++
> >  .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  98 ++++++++--
> >  2 files changed, 255 insertions(+), 12 deletions(-)
> >
> > --
> > 2.43.0
> >
> >
> What does this patchset depend on?  I'm assuming I'm missing something
> in my config as I've tried to test this patchset and I end up with the
> wifi and bluetooth being deferred on my Thinkpad X13s
>
> [   18.655330] pci 0006:01:00.0: deferred probe pending: pci: wait for
> supplier /wcn6855-pmu/regulators/ldo9
> [   18.655347] serial serial0-0: deferred probe pending: serial: wait
> for supplier /wcn6855-pmu/regulators/ldo9
> steev@finn:~$ sudo cat /sys/kernel/debug/devices_deferred
> 0006:01:00.0    pci: wait for supplier /wcn6855-pmu/regulators/ldo9
> serial0-0    serial: wait for supplier /wcn6855-pmu/regulators/ldo9

On Tue, 13 Aug 2024 at 22:12, Steev Klimaszewski <steev@kali.org> wrote:
>
> Hi Bartosz,
>
> On Tue, Aug 13, 2024 at 2:07 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> >
> > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> >
> > This enables WLAN and Bluetooth on two boards using the sc8280xp SoC.
> > For the sc8280xp-crd we add the PMU, wifi and bluetooth nodes with the
> > correctly modelled wiring between them. For the X13s, we rework existing
> > nodes so that they align with the new DT bindings contract.
> >
> > Bartosz Golaszewski (2):
> >   arm64: dts: qcom: sc8280xp-crd: enable bluetooth
> >   arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855
> >
> > Konrad Dybcio (1):
> >   arm64: dts: qcom: sc8280xp-crd: enable wifi
> >
> >  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     | 169 ++++++++++++++++++
> >  .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  98 ++++++++--
> >  2 files changed, 255 insertions(+), 12 deletions(-)
> >
> > --
> > 2.43.0
> >
> >
> What does this patchset depend on?  I'm assuming I'm missing something
> in my config as I've tried to test this patchset and I end up with the
> wifi and bluetooth being deferred on my Thinkpad X13s
>
> [   18.655330] pci 0006:01:00.0: deferred probe pending: pci: wait for
> supplier /wcn6855-pmu/regulators/ldo9
> [   18.655347] serial serial0-0: deferred probe pending: serial: wait
> for supplier /wcn6855-pmu/regulators/ldo9
> steev@finn:~$ sudo cat /sys/kernel/debug/devices_deferred
> 0006:01:00.0    pci: wait for supplier /wcn6855-pmu/regulators/ldo9
> serial0-0    serial: wait for supplier /wcn6855-pmu/regulators/ldo9

Hi Steev!

There's a bunch of driver changes and some fixes needed for this to
work that I sent later. I also sent out DT bindings updates for it. I
decided to target relevant maintainers with smaller chunks because I
have had more luck getting patches upstream this way than when sending
big series with everything in them. Given that QCom patches take ages
to get picked up, I figured the driver changes will be in next by
then.

Your best approach would be to use the public integration branch from
my tree[1] or the one rebased on top of Johan's tree[2].

Bart

[1] https://git.codelinaro.org/bartosz_golaszewski/linux/-/tree/b4/sc8280xp-pwrseq?ref_type=heads
[2] https://git.codelinaro.org/bartosz_golaszewski/linux/-/tree/sc8280xp-pwrseq-on-jhovold?ref_type=heads

Re: [PATCH 0/3] arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth

[Steev Klimaszewski]

On Tue, Aug 13, 2024 at 3:38 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
> On Tue, Aug 13, 2024 at 10:12 PM Steev Klimaszewski <steev@kali.org> wrote:
> >
> > Hi Bartosz,
> >
> > On Tue, Aug 13, 2024 at 2:07 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> > >
> > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> > >
> > > This enables WLAN and Bluetooth on two boards using the sc8280xp SoC.
> > > For the sc8280xp-crd we add the PMU, wifi and bluetooth nodes with the
> > > correctly modelled wiring between them. For the X13s, we rework existing
> > > nodes so that they align with the new DT bindings contract.
> > >
> > > Bartosz Golaszewski (2):
> > >   arm64: dts: qcom: sc8280xp-crd: enable bluetooth
> > >   arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855
> > >
> > > Konrad Dybcio (1):
> > >   arm64: dts: qcom: sc8280xp-crd: enable wifi
> > >
> > >  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     | 169 ++++++++++++++++++
> > >  .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  98 ++++++++--
> > >  2 files changed, 255 insertions(+), 12 deletions(-)
> > >
> > > --
> > > 2.43.0
> > >
> > >
> > What does this patchset depend on?  I'm assuming I'm missing something
> > in my config as I've tried to test this patchset and I end up with the
> > wifi and bluetooth being deferred on my Thinkpad X13s
> >
> > [   18.655330] pci 0006:01:00.0: deferred probe pending: pci: wait for
> > supplier /wcn6855-pmu/regulators/ldo9
> > [   18.655347] serial serial0-0: deferred probe pending: serial: wait
> > for supplier /wcn6855-pmu/regulators/ldo9
> > steev@finn:~$ sudo cat /sys/kernel/debug/devices_deferred
> > 0006:01:00.0    pci: wait for supplier /wcn6855-pmu/regulators/ldo9
> > serial0-0    serial: wait for supplier /wcn6855-pmu/regulators/ldo9
>
> On Tue, 13 Aug 2024 at 22:12, Steev Klimaszewski <steev@kali.org> wrote:
> >
> > Hi Bartosz,
> >
> > On Tue, Aug 13, 2024 at 2:07 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> > >
> > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> > >
> > > This enables WLAN and Bluetooth on two boards using the sc8280xp SoC.
> > > For the sc8280xp-crd we add the PMU, wifi and bluetooth nodes with the
> > > correctly modelled wiring between them. For the X13s, we rework existing
> > > nodes so that they align with the new DT bindings contract.
> > >
> > > Bartosz Golaszewski (2):
> > >   arm64: dts: qcom: sc8280xp-crd: enable bluetooth
> > >   arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855
> > >
> > > Konrad Dybcio (1):
> > >   arm64: dts: qcom: sc8280xp-crd: enable wifi
> > >
> > >  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     | 169 ++++++++++++++++++
> > >  .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  98 ++++++++--
> > >  2 files changed, 255 insertions(+), 12 deletions(-)
> > >
> > > --
> > > 2.43.0
> > >
> > >
> > What does this patchset depend on?  I'm assuming I'm missing something
> > in my config as I've tried to test this patchset and I end up with the
> > wifi and bluetooth being deferred on my Thinkpad X13s
> >
> > [   18.655330] pci 0006:01:00.0: deferred probe pending: pci: wait for
> > supplier /wcn6855-pmu/regulators/ldo9
> > [   18.655347] serial serial0-0: deferred probe pending: serial: wait
> > for supplier /wcn6855-pmu/regulators/ldo9
> > steev@finn:~$ sudo cat /sys/kernel/debug/devices_deferred
> > 0006:01:00.0    pci: wait for supplier /wcn6855-pmu/regulators/ldo9
> > serial0-0    serial: wait for supplier /wcn6855-pmu/regulators/ldo9
>
> Hi Steev!
>
> There's a bunch of driver changes and some fixes needed for this to
> work that I sent later. I also sent out DT bindings updates for it. I
> decided to target relevant maintainers with smaller chunks because I
> have had more luck getting patches upstream this way than when sending
> big series with everything in them. Given that QCom patches take ages
> to get picked up, I figured the driver changes will be in next by
> then.
>
> Your best approach would be to use the public integration branch from
> my tree[1] or the one rebased on top of Johan's tree[2].
>
> Bart
>
> [1] https://git.codelinaro.org/bartosz_golaszewski/linux/-/tree/b4/sc8280xp-pwrseq?ref_type=heads
> [2] https://git.codelinaro.org/bartosz_golaszewski/linux/-/tree/sc8280xp-pwrseq-on-jhovold?ref_type=heads

Thanks for the quick response!  With everything in place, this does
seem to allow both wifi and bluetooth to continue to work on my
Thinkpad X13s
Tested-by: Steev Klimaszewski <steev@kali.org> #Thinkpad X13s

Re: [PATCH 0/3] arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth

[Rob Herring (Arm)]

On Tue, 13 Aug 2024 21:06:35 +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> 
> This enables WLAN and Bluetooth on two boards using the sc8280xp SoC.
> For the sc8280xp-crd we add the PMU, wifi and bluetooth nodes with the
> correctly modelled wiring between them. For the X13s, we rework existing
> nodes so that they align with the new DT bindings contract.
> 
> Bartosz Golaszewski (2):
>   arm64: dts: qcom: sc8280xp-crd: enable bluetooth
>   arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855
> 
> Konrad Dybcio (1):
>   arm64: dts: qcom: sc8280xp-crd: enable wifi
> 
>  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     | 169 ++++++++++++++++++
>  .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  98 ++++++++--
>  2 files changed, 255 insertions(+), 12 deletions(-)
> 
> --
> 2.43.0
> 
> 
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


New warnings running 'make CHECK_DTBS=y qcom/sc8280xp-crd.dtb qcom/sc8280xp-lenovo-thinkpad-x13s.dtb' for 20240813190639.154983-1-brgl@bgdev.pl:

arch/arm64/boot/dts/qcom/sc8280xp-crd.dtb: bluetooth: 'enable-gpios' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-crd.dtb: bluetooth: 'swctrl-gpios' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-crd.dtb: bluetooth: 'vddio-supply' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-crd.dtb: bluetooth: 'vddbtcxmx-supply' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-crd.dtb: bluetooth: 'vddrfa1p7-supply' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb: bluetooth: 'enable-gpios' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb: bluetooth: 'swctrl-gpios' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb: bluetooth: 'vddio-supply' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb: bluetooth: 'vddbtcxmx-supply' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb: bluetooth: 'vddrfa1p7-supply' is a required property
	from schema $id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-crd.dtb: wifi@0: 'vddrfa1p8-supply' does not match any of the regexes: 'pinctrl-[0-9]+'
	from schema $id: http://devicetree.org/schemas/net/wireless/qcom,ath11k-pci.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb: wifi@0: 'vddrfa1p8-supply' does not match any of the regexes: 'pinctrl-[0-9]+'
	from schema $id: http://devicetree.org/schemas/net/wireless/qcom,ath11k-pci.yaml#
arch/arm64/boot/dts/qcom/sc8280xp-crd.dtb: /wcn6855-pmu: failed to match any schema with compatible: ['qcom,wcn6855-pmu']
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb: /wcn6855-pmu: failed to match any schema with compatible: ['qcom,wcn6855-pmu']

Re: [PATCH 0/3] arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth

[Bartosz Golaszewski]

On Wed, 14 Aug 2024 at 17:48, Rob Herring (Arm) <robh@kernel.org> wrote:
>
> My bot found new DTB warnings on the .dts files added or changed in this
> series.
>
> Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
> are fixed by another series. Ultimately, it is up to the platform
> maintainer whether these warnings are acceptable or not. No need to reply
> unless the platform maintainer has comments.
>

Bindings were sent separately.

Bart