[RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Krzysztof Kozlowski]

MTP8750 rev 2.0 (power grid v8) boards come as two different variants
with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
supported by the kernel, but WCN786x is not.  Both of the board variants
are considered newest revisions and the difference is only in MCN
numbers and internal codenames.

Add WCN7850 WiFi and Bluetooth to the MTP8750, stating that this DTS
represents the WCN7850 variant.  The S4D and S5F regulators should
operate at 0.85 V, thus adjust lower constraint and regulator name.

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

---

Posting as RFC because it depends on unpublished PCI DTS patches thus it
cannot be merged/build.

Changes in v2:
1. Add missing &qupv3_2 enable, so Bluetooth works.
2. Adjust also S4D regulator constraint.
---
 arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 133 +++++++++++++++++++++++-
 1 file changed, 129 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
index 57ab028beef4..c25ef6cad9f6 100644
--- a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
@@ -254,6 +254,77 @@ vph_pwr: vph-pwr-regulator {
 		regulator-always-on;
 		regulator-boot-on;
 	};
+
+	/*
+	 * MTPs rev 2.0 (power grid v8) come with two different WiFi chips:
+	 * WCN7850 and WCN786x.
+	 * They use the same enable GPIOs and share (almost) the same supplies.
+	 * The WCN7850 supplies are superset of WCN786x variant.
+	 *
+	 * Device nodes here for the PMU, WiFi and Bluetooth describe the MTP
+	 * variant with WCN7850.
+	 */
+	wcn7850-pmu {
+		compatible = "qcom,wcn7850-pmu";
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&wlan_en>, <&bt_default>;
+
+		wlan-enable-gpios = <&tlmm 16 GPIO_ACTIVE_HIGH>;
+		bt-enable-gpios = <&pm8550ve_f_gpios 3 GPIO_ACTIVE_HIGH>;
+
+		vdd-supply = <&vreg_s5f_0p85>;
+		vddio-supply = <&vreg_l3f_1p8>;
+		vddio1p2-supply = <&vreg_l2f_1p2>;
+		vddaon-supply = <&vreg_s4d_0p85>;
+		vdddig-supply = <&vreg_s1d_0p97>;
+		vddrfa1p2-supply = <&vreg_s7i_1p2>;
+		vddrfa1p8-supply = <&vreg_s3g_1p8>;
+
+		clocks = <&rpmhcc RPMH_RF_CLK1>;
+
+		regulators {
+			vreg_pmu_rfa_cmn: ldo0 {
+				regulator-name = "vreg_pmu_rfa_cmn";
+			};
+
+			vreg_pmu_aon_0p59: ldo1 {
+				regulator-name = "vreg_pmu_aon_0p59";
+			};
+
+			vreg_pmu_wlcx_0p8: ldo2 {
+				regulator-name = "vreg_pmu_wlcx_0p8";
+			};
+
+			vreg_pmu_wlmx_0p85: ldo3 {
+				regulator-name = "vreg_pmu_wlmx_0p85";
+			};
+
+			vreg_pmu_btcmx_0p85: ldo4 {
+				regulator-name = "vreg_pmu_btcmx_0p85";
+			};
+
+			vreg_pmu_rfa_0p8: ldo5 {
+				regulator-name = "vreg_pmu_rfa_0p8";
+			};
+
+			vreg_pmu_rfa_1p2: ldo6 {
+				regulator-name = "vreg_pmu_rfa_1p2";
+			};
+
+			vreg_pmu_rfa_1p8: ldo7 {
+				regulator-name = "vreg_pmu_rfa_1p8";
+			};
+
+			vreg_pmu_pcie_0p9: ldo8 {
+				regulator-name = "vreg_pmu_pcie_0p9";
+			};
+
+			vreg_pmu_pcie_1p8: ldo9 {
+				regulator-name = "vreg_pmu_pcie_1p8";
+			};
+		};
+	};
 };
 
 &apps_rsc {
@@ -479,7 +550,7 @@ vreg_s3d_1p2: smps3 {
 
 		vreg_s4d_0p85: smps4 {
 			regulator-name = "vreg_s4d_0p85";
-			regulator-min-microvolt = <500000>;
+			regulator-min-microvolt = <852000>;
 			regulator-max-microvolt = <1036000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
@@ -525,9 +596,9 @@ regulators-2 {
 
 		qcom,pmic-id = "f";
 
-		vreg_s5f_0p5: smps5 {
-			regulator-name = "vreg_s5f_0p5";
-			regulator-min-microvolt = <500000>;
+		vreg_s5f_0p85: smps5 {
+			regulator-name = "vreg_s5f_0p85";
+			regulator-min-microvolt = <852000>;
 			regulator-max-microvolt = <1000000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
@@ -1047,6 +1118,23 @@ &pcie0_phy {
 	status = "okay";
 };
 
+&pcieport0 {
+	wifi@0 {
+		compatible = "pci17cb,1107";
+		reg = <0x10000 0x0 0x0 0x0 0x0>;
+
+		vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
+		vddaon-supply = <&vreg_pmu_aon_0p59>;
+		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
+		vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
+		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
+		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
+		vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
+		vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
+		vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
+	};
+};
+
 &pmih0108_eusb2_repeater {
 	status = "okay";
 
@@ -1063,6 +1151,10 @@ &qupv3_1 {
 	status = "okay";
 };
 
+&qupv3_2 {
+	status = "okay";
+};
+
 &remoteproc_adsp {
 	firmware-name = "qcom/sm8750/adsp.mbn",
 			"qcom/sm8750/adsp_dtb.mbn";
@@ -1182,6 +1274,14 @@ spkr_1_sd_n_active: spkr-1-sd-n-active-state {
 };
 
 &tlmm {
+	bt_default: bt-default-state {
+		sw-ctrl-pins {
+			pins = "gpio18";
+			function = "gpio";
+			bias-pull-down;
+		};
+	};
+
 	disp0_reset_n_active: disp0-reset-n-active-state {
 		pins = "gpio98";
 		function = "gpio";
@@ -1217,6 +1317,31 @@ wcd_default: wcd-reset-n-active-state {
 		bias-disable;
 		output-low;
 	};
+
+	wlan_en: wlan-en-state {
+		pins = "gpio16";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-down;
+	};
+};
+
+&uart14 {
+	status = "okay";
+
+	bluetooth {
+		compatible = "qcom,wcn7850-bt";
+
+		vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
+		vddaon-supply = <&vreg_pmu_aon_0p59>;
+		vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
+		vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
+		vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
+		vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
+		vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
+
+		max-speed = <3200000>;
+	};
 };
 
 &ufs_mem_phy {
-- 
2.48.1

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Dmitry Baryshkov]

On Mon, Aug 11, 2025 at 03:10:56PM +0200, Krzysztof Kozlowski wrote:
> MTP8750 rev 2.0 (power grid v8) boards come as two different variants
> with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
> supported by the kernel, but WCN786x is not.  Both of the board variants
> are considered newest revisions and the difference is only in MCN
> numbers and internal codenames.

Are they soldered on board, installed via add-on cards or installed via
M.2 slot?

Are they going to be somewhat compatible (e.g. on the BT side?)

> 
> Add WCN7850 WiFi and Bluetooth to the MTP8750, stating that this DTS
> represents the WCN7850 variant.  The S4D and S5F regulators should
> operate at 0.85 V, thus adjust lower constraint and regulator name.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---

-- 
With best wishes
Dmitry

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Krzysztof Kozlowski]

On 11/08/2025 16:22, Dmitry Baryshkov wrote:
> On Mon, Aug 11, 2025 at 03:10:56PM +0200, Krzysztof Kozlowski wrote:
>> MTP8750 rev 2.0 (power grid v8) boards come as two different variants
>> with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
>> supported by the kernel, but WCN786x is not.  Both of the board variants
>> are considered newest revisions and the difference is only in MCN
>> numbers and internal codenames.
> 
> Are they soldered on board, installed via add-on cards or installed via
> M.2 slot?

This is MTP, so same answer as other MTPs - these are replaceable parts,
just like you can replace display or modem.

> 
> Are they going to be somewhat compatible (e.g. on the BT side?)

No clue, you need to ask Qualcomm people - it's their hardware.

Best regards,
Krzysztof

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Dmitry Baryshkov]

On Mon, Aug 11, 2025 at 04:25:47PM +0200, Krzysztof Kozlowski wrote:
> On 11/08/2025 16:22, Dmitry Baryshkov wrote:
> > On Mon, Aug 11, 2025 at 03:10:56PM +0200, Krzysztof Kozlowski wrote:
> >> MTP8750 rev 2.0 (power grid v8) boards come as two different variants
> >> with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
> >> supported by the kernel, but WCN786x is not.  Both of the board variants
> >> are considered newest revisions and the difference is only in MCN
> >> numbers and internal codenames.
> > 
> > Are they soldered on board, installed via add-on cards or installed via
> > M.2 slot?
> 
> This is MTP, so same answer as other MTPs - these are replaceable parts,
> just like you can replace display or modem.
> 
> > 
> > Are they going to be somewhat compatible (e.g. on the BT side?)
> 
> No clue, you need to ask Qualcomm people - it's their hardware.

And you (hopefully) have access to the docs.

-- 
With best wishes
Dmitry

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Krzysztof Kozlowski]

On 11/08/2025 16:33, Dmitry Baryshkov wrote:
> On Mon, Aug 11, 2025 at 04:25:47PM +0200, Krzysztof Kozlowski wrote:
>> On 11/08/2025 16:22, Dmitry Baryshkov wrote:
>>> On Mon, Aug 11, 2025 at 03:10:56PM +0200, Krzysztof Kozlowski wrote:
>>>> MTP8750 rev 2.0 (power grid v8) boards come as two different variants
>>>> with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
>>>> supported by the kernel, but WCN786x is not.  Both of the board variants
>>>> are considered newest revisions and the difference is only in MCN
>>>> numbers and internal codenames.
>>>
>>> Are they soldered on board, installed via add-on cards or installed via
>>> M.2 slot?
>>
>> This is MTP, so same answer as other MTPs - these are replaceable parts,
>> just like you can replace display or modem.
>>
>>>
>>> Are they going to be somewhat compatible (e.g. on the BT side?)
>>
>> No clue, you need to ask Qualcomm people - it's their hardware.
> 
> And you (hopefully) have access to the docs.


No, fought with that for 1 year, got some basic docs only. It is very
difficult to get any access to these docs. I assume you mean the MTP board.

If you mean Bluetooth or WiFi - I have 0 access there.

Best regards,
Krzysztof

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Dmitry Baryshkov]

On Mon, Aug 11, 2025 at 04:40:09PM +0200, Krzysztof Kozlowski wrote:
> On 11/08/2025 16:33, Dmitry Baryshkov wrote:
> > On Mon, Aug 11, 2025 at 04:25:47PM +0200, Krzysztof Kozlowski wrote:
> >> On 11/08/2025 16:22, Dmitry Baryshkov wrote:
> >>> On Mon, Aug 11, 2025 at 03:10:56PM +0200, Krzysztof Kozlowski wrote:
> >>>> MTP8750 rev 2.0 (power grid v8) boards come as two different variants
> >>>> with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
> >>>> supported by the kernel, but WCN786x is not.  Both of the board variants
> >>>> are considered newest revisions and the difference is only in MCN
> >>>> numbers and internal codenames.
> >>>
> >>> Are they soldered on board, installed via add-on cards or installed via
> >>> M.2 slot?
> >>
> >> This is MTP, so same answer as other MTPs - these are replaceable parts,
> >> just like you can replace display or modem.
> >>
> >>>
> >>> Are they going to be somewhat compatible (e.g. on the BT side?)
> >>
> >> No clue, you need to ask Qualcomm people - it's their hardware.
> > 
> > And you (hopefully) have access to the docs.
> 
> 
> No, fought with that for 1 year, got some basic docs only. It is very
> difficult to get any access to these docs. I assume you mean the MTP board.
> 
> If you mean Bluetooth or WiFi - I have 0 access there.

I mean WiFi / BT. Then you can ask Jeff or a corresponding BT maintainer
to provide necessary details. You make it sound as if you are not a part
of the system. You are. You can talk to necessary people within
Qualcomm.

-- 
With best wishes
Dmitry

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Krzysztof Kozlowski]

On 12/08/2025 13:00, Dmitry Baryshkov wrote:
> On Mon, Aug 11, 2025 at 04:40:09PM +0200, Krzysztof Kozlowski wrote:
>> On 11/08/2025 16:33, Dmitry Baryshkov wrote:
>>> On Mon, Aug 11, 2025 at 04:25:47PM +0200, Krzysztof Kozlowski wrote:
>>>> On 11/08/2025 16:22, Dmitry Baryshkov wrote:
>>>>> On Mon, Aug 11, 2025 at 03:10:56PM +0200, Krzysztof Kozlowski wrote:
>>>>>> MTP8750 rev 2.0 (power grid v8) boards come as two different variants
>>>>>> with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
>>>>>> supported by the kernel, but WCN786x is not.  Both of the board variants
>>>>>> are considered newest revisions and the difference is only in MCN
>>>>>> numbers and internal codenames.
>>>>>
>>>>> Are they soldered on board, installed via add-on cards or installed via
>>>>> M.2 slot?
>>>>
>>>> This is MTP, so same answer as other MTPs - these are replaceable parts,
>>>> just like you can replace display or modem.
>>>>
>>>>>
>>>>> Are they going to be somewhat compatible (e.g. on the BT side?)
>>>>
>>>> No clue, you need to ask Qualcomm people - it's their hardware.
>>>
>>> And you (hopefully) have access to the docs.
>>
>>
>> No, fought with that for 1 year, got some basic docs only. It is very
>> difficult to get any access to these docs. I assume you mean the MTP board.
>>
>> If you mean Bluetooth or WiFi - I have 0 access there.
> 
> I mean WiFi / BT. Then you can ask Jeff or a corresponding BT maintainer
> to provide necessary details. You make it sound as if you are not a part
> of the system. You are. You can talk to necessary people within
> Qualcomm.


This feels like creating obstacles and some new sort of requests that
contributor for hardware A has to come with answers about completely
different new hardware B, so please provide rationale for such request.

I see no reason why compatibility between bluetooth of WCN7850 and
WCN786x is relevant here. Even if I knew the compatibility or
differences between WCN7850 and new WCN786x, I cannot publicly speak
about them.

Devices will be different, they will have different compatibles, thus
you CANNOT have one DTS for both. What else - not my task, not my
expertise, not relevant to this submission.

Best regards,
Krzysztof

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Dmitry Baryshkov]

On Tue, Aug 12, 2025 at 01:07:20PM +0200, Krzysztof Kozlowski wrote:
> On 12/08/2025 13:00, Dmitry Baryshkov wrote:
> > On Mon, Aug 11, 2025 at 04:40:09PM +0200, Krzysztof Kozlowski wrote:
> >> On 11/08/2025 16:33, Dmitry Baryshkov wrote:
> >>> On Mon, Aug 11, 2025 at 04:25:47PM +0200, Krzysztof Kozlowski wrote:
> >>>> On 11/08/2025 16:22, Dmitry Baryshkov wrote:
> >>>>> On Mon, Aug 11, 2025 at 03:10:56PM +0200, Krzysztof Kozlowski wrote:
> >>>>>> MTP8750 rev 2.0 (power grid v8) boards come as two different variants
> >>>>>> with different WiFi chips: WCN7850 and WCN786x.  WCN7850 is already
> >>>>>> supported by the kernel, but WCN786x is not.  Both of the board variants
> >>>>>> are considered newest revisions and the difference is only in MCN
> >>>>>> numbers and internal codenames.
> >>>>>
> >>>>> Are they soldered on board, installed via add-on cards or installed via
> >>>>> M.2 slot?
> >>>>
> >>>> This is MTP, so same answer as other MTPs - these are replaceable parts,
> >>>> just like you can replace display or modem.
> >>>>
> >>>>>
> >>>>> Are they going to be somewhat compatible (e.g. on the BT side?)
> >>>>
> >>>> No clue, you need to ask Qualcomm people - it's their hardware.
> >>>
> >>> And you (hopefully) have access to the docs.
> >>
> >>
> >> No, fought with that for 1 year, got some basic docs only. It is very
> >> difficult to get any access to these docs. I assume you mean the MTP board.
> >>
> >> If you mean Bluetooth or WiFi - I have 0 access there.
> > 
> > I mean WiFi / BT. Then you can ask Jeff or a corresponding BT maintainer
> > to provide necessary details. You make it sound as if you are not a part
> > of the system. You are. You can talk to necessary people within
> > Qualcomm.
> 
> 
> This feels like creating obstacles and some new sort of requests that
> contributor for hardware A has to come with answers about completely
> different new hardware B, so please provide rationale for such request.
> 
> I see no reason why compatibility between bluetooth of WCN7850 and
> WCN786x is relevant here. Even if I knew the compatibility or
> differences between WCN7850 and new WCN786x, I cannot publicly speak
> about them.

It was you, who mentioned WCN786x and you didn't mention that it's a
not-yet-available hardware. So, how would I guess that?

> Devices will be different, they will have different compatibles, thus
> you CANNOT have one DTS for both. What else - not my task, not my
> expertise, not relevant to this submission.

Them having different compatibles is exactly my question. It's not
obvious if they are compatible or not.

We've discussed this offline and I hope that the next iteration will
cover all these details.

-- 
With best wishes
Dmitry

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Krzysztof Kozlowski]

On 12/08/2025 14:45, Dmitry Baryshkov wrote:
> 
>> Devices will be different, they will have different compatibles, thus
>> you CANNOT have one DTS for both. What else - not my task, not my
>> expertise, not relevant to this submission.
> 
> Them having different compatibles is exactly my question. It's not
> obvious if they are compatible or not.


So we talk about basics now... even if devices are compatible, they will
have different "compatible" property, so your question about
compatibility does not matter. They could be compatible or could be not.
Different DTS in both cases, so this is just bikeschedding this patch.

> 
> We've discussed this offline and I hope that the next iteration will
> cover all these details.
> 


Best regards,
Krzysztof

Re: [RFC PATCH v2] arm64: dts: qcom: sm8750-mtp: Add WiFi and Bluetooth

[Dmitry Baryshkov]

On Wed, Aug 13, 2025 at 08:49:56PM +0200, Krzysztof Kozlowski wrote:
> On 12/08/2025 14:45, Dmitry Baryshkov wrote:
> > 
> >> Devices will be different, they will have different compatibles, thus
> >> you CANNOT have one DTS for both. What else - not my task, not my
> >> expertise, not relevant to this submission.
> > 
> > Them having different compatibles is exactly my question. It's not
> > obvious if they are compatible or not.
> 
> 
> So we talk about basics now... even if devices are compatible, they will
> have different "compatible" property, so your question about
> compatibility does not matter. They could be compatible or could be not.
> Different DTS in both cases, so this is just bikeschedding this patch.

Yes, we seem to be talking about the basics. Having hardware which is
compatible with another hardware released earlier.

I'll leave this to the maintainer's discretion.

> 
> > 
> > We've discussed this offline and I hope that the next iteration will
> > cover all these details.
> > 
> 
> 
> Best regards,
> Krzysztof

-- 
With best wishes
Dmitry