| Message ID | 20240903093629.16242-4-brgl@bgdev.pl (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: sc8280xp: enable WLAN and Bluetooth | expand |
On Tue, Sep 03, 2024 at 11:36:28AM GMT, Bartosz Golaszewski wrote: > 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. > > Tested-by: Steev Klimaszewski <steev@kali.org> # Thinkpad X13s > 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 6a28cab97189..88b31550f9df 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>; As the WiFi is now properly using the PMU, should we also remove some of the regulator-always-on properties? > +
On Tue, Sep 3, 2024 at 4:18 PM Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > On Tue, Sep 03, 2024 at 11:36:28AM GMT, Bartosz Golaszewski wrote: > > 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. > > > > Tested-by: Steev Klimaszewski <steev@kali.org> # Thinkpad X13s > > 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 6a28cab97189..88b31550f9df 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>; > > As the WiFi is now properly using the PMU, should we also remove some of > the regulator-always-on properties? > I added a separate patch that doesn't seem to impact anything with the PMU changes applied but will be easy to revert if something does break. Bart > > + > > -- > With best wishes > Dmitry
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 6a28cab97189..88b31550f9df 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 { @@ -927,6 +988,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"; }; }; @@ -1258,20 +1329,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"; }; }; @@ -1761,4 +1828,11 @@ reset-pins { bias-disable; }; }; + + wlan_en: wlan-en-state { + pins = "gpio134"; + function = "gpio"; + drive-strength = <8>; + bias-pull-down; + }; };