arm64: dts: qcom: sm8650-qrd: use the PMU to power up bluetooth

Change the HW model in sm8650-qrd.dts to a one closer to reality - where
the WLAN and Bluetooth modules of the WCN7850 are powered by the PMU
inside the package.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Link: https://lore.kernel.org/r/20240709-hci_qca_refactor-v3-6-5f48ca001fed@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
index b0d7927b708f1d01877c9177da5e02180a333029..8ca0d28eba9bd050bb09a11ac267d77a8439a954 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
@@ -208,13 +208,10 @@
                compatible = "qcom,wcn7850-pmu";
 
                pinctrl-names = "default";
-               pinctrl-0 = <&wlan_en>;
+               pinctrl-0 = <&wlan_en>, <&bt_default>;
 
                wlan-enable-gpios = <&tlmm 16 GPIO_ACTIVE_HIGH>;
-               /*
-                * TODO Add bt-enable-gpios once the Bluetooth driver is
-                * converted to using the power sequencer.
-                */
+               bt-enable-gpios = <&tlmm 17 GPIO_ACTIVE_HIGH>;
 
                vdd-supply = <&vreg_s4i_0p85>;
                vddio-supply = <&vreg_l15b_1p8>;
@@ -1255,22 +1252,15 @@
        bluetooth {
                compatible = "qcom,wcn7850-bt";
 
-               clocks = <&rpmhcc RPMH_RF_CLK1>;
-
-               vddio-supply = <&vreg_l3c_1p2>;
-               vddaon-supply = <&vreg_l15b_1p8>;
-               vdddig-supply = <&vreg_s3c_0p9>;
-               vddrfa0p8-supply = <&vreg_s3c_0p9>;
-               vddrfa1p2-supply = <&vreg_s1c_1p2>;
-               vddrfa1p9-supply = <&vreg_s6c_1p8>;
+               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>;
-
-               enable-gpios = <&tlmm 17 GPIO_ACTIVE_HIGH>;
-               swctrl-gpios = <&tlmm 18 GPIO_ACTIVE_HIGH>;
-
-               pinctrl-0 = <&bt_default>;
-               pinctrl-names = "default";
        };
 };