| Message ID | 20240718125545.2238857-1-amit.pundir@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 73655137a570e4a3cd226fd9f17920f507cec028 |
| Headers | show |
| Series | [v2] arm64: dts: qcom: sm8550-hdk: add the Wifi node | expand |
On Thu, Jul 18, 2024 at 06:25:45PM GMT, Amit Pundir wrote: > Describe the ath12k WLAN on-board the WCN7850 module present on the > board. > > Signed-off-by: Amit Pundir <amit.pundir@linaro.org> > --- > v2: Changes suggested by Neil Which changes? > > v1: Kanged verbatim from 490812872449 ("arm64: dts: qcom: sm8550-qrd: add the Wifi node"). > Link: https://lore.kernel.org/lkml/20240702091655.278974-1-amit.pundir@linaro.org/T/#u > > arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 113 +++++++++++++++++++++--- > 1 file changed, 101 insertions(+), 12 deletions(-) >
On Thu, 18 Jul 2024 at 18:36, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > On Thu, Jul 18, 2024 at 06:25:45PM GMT, Amit Pundir wrote: > > Describe the ath12k WLAN on-board the WCN7850 module present on the > > board. > > > > Signed-off-by: Amit Pundir <amit.pundir@linaro.org> > > --- > > v2: Changes suggested by Neil > > Which changes? Neil suggested a few changes to enable 'bt-enable-gpios' in sm8550-hdk, now that the hci_qca driver uses the power sequencer for wcn7850 https://lore.kernel.org/lkml/d3416be5-b97f-4db6-a779-9c436e41dd72@linaro.org/ Similar to this sm8650-qrd change https://lore.kernel.org/all/20240709-hci_qca_refactor-v3-6-5f48ca001fed@linaro.org/ > > > > > v1: Kanged verbatim from 490812872449 ("arm64: dts: qcom: sm8550-qrd: add the Wifi node"). > > Link: https://lore.kernel.org/lkml/20240702091655.278974-1-amit.pundir@linaro.org/T/#u > > > > arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 113 +++++++++++++++++++++--- > > 1 file changed, 101 insertions(+), 12 deletions(-) > > > > > -- > With best wishes > Dmitry
On Thu, 18 Jul 2024 at 16:56, Amit Pundir <amit.pundir@linaro.org> wrote: > > On Thu, 18 Jul 2024 at 18:36, Dmitry Baryshkov > <dmitry.baryshkov@linaro.org> wrote: > > > > On Thu, Jul 18, 2024 at 06:25:45PM GMT, Amit Pundir wrote: > > > Describe the ath12k WLAN on-board the WCN7850 module present on the > > > board. > > > > > > Signed-off-by: Amit Pundir <amit.pundir@linaro.org> > > > --- > > > v2: Changes suggested by Neil > > > > Which changes? > > Neil suggested a few changes to enable 'bt-enable-gpios' in > sm8550-hdk, now that the hci_qca driver uses the power sequencer for You should have described such changes in the changelog. Note, no need to send v3 just for this reason. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > wcn7850 https://lore.kernel.org/lkml/d3416be5-b97f-4db6-a779-9c436e41dd72@linaro.org/ > > Similar to this sm8650-qrd change > https://lore.kernel.org/all/20240709-hci_qca_refactor-v3-6-5f48ca001fed@linaro.org/
On Thu, 18 Jul 2024 at 19:34, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > On Thu, 18 Jul 2024 at 16:56, Amit Pundir <amit.pundir@linaro.org> wrote: > > > > On Thu, 18 Jul 2024 at 18:36, Dmitry Baryshkov > > <dmitry.baryshkov@linaro.org> wrote: > > > > > > On Thu, Jul 18, 2024 at 06:25:45PM GMT, Amit Pundir wrote: > > > > Describe the ath12k WLAN on-board the WCN7850 module present on the > > > > board. > > > > > > > > Signed-off-by: Amit Pundir <amit.pundir@linaro.org> > > > > --- > > > > v2: Changes suggested by Neil > > > > > > Which changes? > > > > Neil suggested a few changes to enable 'bt-enable-gpios' in > > sm8550-hdk, now that the hci_qca driver uses the power sequencer for > > You should have described such changes in the changelog. Note, no need > to send v3 just for this reason. Noted. I'll keep that in mind for the next time. Thanks Dmitry. > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > > wcn7850 https://lore.kernel.org/lkml/d3416be5-b97f-4db6-a779-9c436e41dd72@linaro.org/ > > > > Similar to this sm8650-qrd change > > https://lore.kernel.org/all/20240709-hci_qca_refactor-v3-6-5f48ca001fed@linaro.org/ > > > -- > With best wishes > Dmitry
On Thu, 18 Jul 2024 18:25:45 +0530, Amit Pundir wrote: > Describe the ath12k WLAN on-board the WCN7850 module present on the > board. > > Applied, thanks! [1/1] arm64: dts: qcom: sm8550-hdk: add the Wifi node commit: 73655137a570e4a3cd226fd9f17920f507cec028 Best regards,
diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts index 12d60a0ee095..0fc55334e26c 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts @@ -279,6 +279,65 @@ platform { }; }; }; + + wcn7850-pmu { + compatible = "qcom,wcn7850-pmu"; + + pinctrl-names = "default"; + pinctrl-0 = <&wlan_en>, <&bt_default>, <&pmk8550_sleep_clk>; + + wlan-enable-gpios = <&tlmm 80 GPIO_ACTIVE_HIGH>; + bt-enable-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; + + vdd-supply = <&vreg_s5g_0p85>; + vddio-supply = <&vreg_l15b_1p8>; + vddaon-supply = <&vreg_s2g_0p85>; + vdddig-supply = <&vreg_s4e_0p95>; + vddrfa1p2-supply = <&vreg_s4g_1p25>; + vddrfa1p8-supply = <&vreg_s6g_1p86>; + + 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 { @@ -954,6 +1013,23 @@ &pcie0 { 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>; + }; +}; + &pcie0_phy { vdda-phy-supply = <&vreg_l1e_0p88>; vdda-pll-supply = <&vreg_l3e_1p2>; @@ -1046,6 +1122,17 @@ &pon_resin { status = "okay"; }; +&pmk8550_gpios { + pmk8550_sleep_clk: sleep-clk-state { + pins = "gpio3"; + function = "func1"; + input-disable; + output-enable; + bias-disable; + power-source = <0>; + }; +}; + &qupv3_id_0 { status = "okay"; }; @@ -1206,6 +1293,13 @@ wcd_default: wcd-reset-n-active-state { bias-disable; output-low; }; + + wlan_en: wlan-en-state { + pins = "gpio80"; + function = "gpio"; + drive-strength = <8>; + bias-pull-down; + }; }; &uart7 { @@ -1218,20 +1312,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"; }; };
Describe the ath12k WLAN on-board the WCN7850 module present on the board. Signed-off-by: Amit Pundir <amit.pundir@linaro.org> --- v2: Changes suggested by Neil v1: Kanged verbatim from 490812872449 ("arm64: dts: qcom: sm8550-qrd: add the Wifi node"). Link: https://lore.kernel.org/lkml/20240702091655.278974-1-amit.pundir@linaro.org/T/#u arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 113 +++++++++++++++++++++--- 1 file changed, 101 insertions(+), 12 deletions(-)