On Tue, 16 Jul 2024 at 15:10, Neil Armstrong <neil.armstrong@xxxxxxxxxx> wrote:
>
> Hi,
>
> On 02/07/2024 11:16, Amit Pundir wrote:
> > Describe the ath12k WLAN on-board the WCN7850 module present on the
> > board.
> >
> > Signed-off-by: Amit Pundir <amit.pundir@xxxxxxxxxx>
> > ---
> > Kanged verbatim from 490812872449 ("arm64: dts: qcom: sm8550-qrd: add the Wifi node").
> >
> > arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 97 +++++++++++++++++++++++++
> > 1 file changed, 97 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> > index 12d60a0ee095..c453d081a2df 100644
> > --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> > +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> > @@ -279,6 +279,68 @@ platform {
> > };
> > };
> > };
> > +
> > + wcn7850-pmu {
> > + compatible = "qcom,wcn7850-pmu";
> > +
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&wlan_en>, <&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.
> > + */
>
> <snip>
>
> Now [1] driver & bindings changes were merged, could you resend with the following squashed:
Done. Thank you very much Neil.
>
> [1] https://lore.kernel.org/all/20240709-hci_qca_refactor-v3-0-5f48ca001fed@xxxxxxxxxx/
>
> ====><=====================================
> diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> index 0fa0b79de741..01c921602605 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
> @@ -284,13 +284,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>;
> @@ -1312,20 +1309,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";
> };
> };
> ====><=====================================
>
> Thanks,
> Neil
