| Message ID | 20240716-topic-sm8x50-upstream-use-pmu-to-power-up-bt-v1-2-67b3755edf6a@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | af8f801f59ed6fbe490414fa61276287f7aca332 |
| Headers | show |
| Series | arm64: dts: qcom: sm8[56]50: use the PMU to power up bluetooth | expand |
On Tue, Jul 16, 2024 at 11:45:11AM GMT, Neil Armstrong wrote: > Change the HW model in sm8550-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: Neil Armstrong <neil.armstrong@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 26 +++++++++----------------- > 1 file changed, 9 insertions(+), 17 deletions(-) > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Tue, Jul 16, 2024 at 11:45 AM Neil Armstrong <neil.armstrong@linaro.org> wrote: > > Change the HW model in sm8550-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: Neil Armstrong <neil.armstrong@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 26 +++++++++----------------- > 1 file changed, 9 insertions(+), 17 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts > index 774bdfcffec3..6052dd922ec5 100644 > --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts > +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts > @@ -219,13 +219,10 @@ wcn7850-pmu { > compatible = "qcom,wcn7850-pmu"; > > pinctrl-names = "default"; > - pinctrl-0 = <&wlan_en>, <&pmk8550_sleep_clk>; > + pinctrl-0 = <&wlan_en>, <&bt_default>, <&pmk8550_sleep_clk>; > > wlan-enable-gpios = <&tlmm 80 GPIO_ACTIVE_HIGH>; > - /* > - * TODO Add bt-enable-gpios once the Bluetooth driver is > - * converted to using the power sequencer. > - */ > + bt-enable-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; > > vdd-supply = <&vreg_s5g_0p85>; > vddio-supply = <&vreg_l15b_1p8>; > @@ -1175,20 +1172,15 @@ &uart14 { > bluetooth { > compatible = "qcom,wcn7850-bt"; > > - vddio-supply = <&vreg_l15b_1p8>; > - vddaon-supply = <&vreg_s4e_0p95>; > - vdddig-supply = <&vreg_s4e_0p95>; > - vddrfa0p8-supply = <&vreg_s4e_0p95>; > - vddrfa1p2-supply = <&vreg_s4g_1p25>; > - vddrfa1p9-supply = <&vreg_s6g_1p86>; > + 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 81 GPIO_ACTIVE_HIGH>; > - swctrl-gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>; > - > - pinctrl-0 = <&bt_default>; > - pinctrl-names = "default"; > }; > }; > > > -- > 2.34.1 > Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts index 774bdfcffec3..6052dd922ec5 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts @@ -219,13 +219,10 @@ wcn7850-pmu { compatible = "qcom,wcn7850-pmu"; pinctrl-names = "default"; - pinctrl-0 = <&wlan_en>, <&pmk8550_sleep_clk>; + pinctrl-0 = <&wlan_en>, <&bt_default>, <&pmk8550_sleep_clk>; wlan-enable-gpios = <&tlmm 80 GPIO_ACTIVE_HIGH>; - /* - * TODO Add bt-enable-gpios once the Bluetooth driver is - * converted to using the power sequencer. - */ + bt-enable-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; vdd-supply = <&vreg_s5g_0p85>; vddio-supply = <&vreg_l15b_1p8>; @@ -1175,20 +1172,15 @@ &uart14 { bluetooth { compatible = "qcom,wcn7850-bt"; - vddio-supply = <&vreg_l15b_1p8>; - vddaon-supply = <&vreg_s4e_0p95>; - vdddig-supply = <&vreg_s4e_0p95>; - vddrfa0p8-supply = <&vreg_s4e_0p95>; - vddrfa1p2-supply = <&vreg_s4g_1p25>; - vddrfa1p9-supply = <&vreg_s6g_1p86>; + 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 81 GPIO_ACTIVE_HIGH>; - swctrl-gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>; - - pinctrl-0 = <&bt_default>; - pinctrl-names = "default"; }; };
Change the HW model in sm8550-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: Neil Armstrong <neil.armstrong@linaro.org> --- arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)