* [PATCH v2 1/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add qca6390-pmu node
@ 2024-10-07 13:02 Jianhua Lu
2024-10-07 13:02 ` [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node Jianhua Lu
2024-10-07 13:02 ` [PATCH v2 3/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add bluetooth node Jianhua Lu
0 siblings, 2 replies; 6+ messages in thread
From: Jianhua Lu @ 2024-10-07 13:02 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Kalle Valo, Jeff Johnson
Cc: linux-arm-msm, devicetree, linux-kernel, ath11k, Jianhua Lu,
Dmitry Baryshkov
Add qca6390-pmu node, which is used to manage power supply sequence for wifi and
bluetooth on sm8250 soc based devices.
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Jianhua Lu <lujianhua000@gmail.com>
---
changes in v2:
1. pick up Dmitry Baryshkov's Reviewed-by
.../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 77 +++++++++++++++++++
1 file changed, 77 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index 3596dd328c31..ebea283f56ea 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -97,6 +97,67 @@ key-vol-up {
};
};
+ qca6390-pmu {
+ compatible = "qcom,qca6390-pmu";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_en_state>, <&wlan_en_state>;
+
+ vddaon-supply = <&vreg_s6a_0p95>;
+ vddpmu-supply = <&vreg_s6a_0p95>;
+ vddrfa0p95-supply = <&vreg_s6a_0p95>;
+ vddrfa1p3-supply = <&vreg_s8c_1p35>;
+ vddrfa1p9-supply = <&vreg_s5a_1p9>;
+ vddpcie1p3-supply = <&vreg_s8c_1p35>;
+ vddpcie1p9-supply = <&vreg_s5a_1p9>;
+ vddio-supply = <&vreg_s4a_1p8>;
+
+ wlan-enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
+ bt-enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
+
+ 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_1p7: ldo7 {
+ regulator-name = "vreg_pmu_rfa_1p7";
+ };
+
+ vreg_pmu_pcie_0p9: ldo8 {
+ regulator-name = "vreg_pmu_pcie_0p9";
+ };
+
+ vreg_pmu_pcie_1p8: ldo9 {
+ regulator-name = "vreg_pmu_pcie_1p8";
+ };
+ };
+ };
+
vph_pwr: vph-pwr-regulator {
compatible = "regulator-fixed";
regulator-name = "vph_pwr";
@@ -701,6 +762,22 @@ &slpi {
&tlmm {
gpio-reserved-ranges = <40 4>;
+
+ bt_en_state: bt-default-state {
+ pins = "gpio21";
+ function = "gpio";
+ drive-strength = <16>;
+ output-low;
+ bias-pull-up;
+ };
+
+ wlan_en_state: wlan-default-state {
+ pins = "gpio20";
+ function = "gpio";
+ drive-strength = <16>;
+ output-low;
+ bias-pull-up;
+ };
};
&usb_1 {
--
2.46.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node
2024-10-07 13:02 [PATCH v2 1/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add qca6390-pmu node Jianhua Lu
@ 2024-10-07 13:02 ` Jianhua Lu
2024-10-07 13:10 ` Jianhua Lu
2024-10-07 18:40 ` Jeff Johnson
2024-10-07 13:02 ` [PATCH v2 3/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add bluetooth node Jianhua Lu
1 sibling, 2 replies; 6+ messages in thread
From: Jianhua Lu @ 2024-10-07 13:02 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Kalle Valo, Jeff Johnson
Cc: linux-arm-msm, devicetree, linux-kernel, ath11k, Jianhua Lu
Add wifi node and this wifi module is connected to pice port.
The following is qca6390 probe message:
ath11k_pci 0000:01:00.0: Adding to iommu group 12
ath11k_pci 0000:01:00.0: BAR 0 [mem 0x60400000-0x604fffff 64bit]: assigned
ath11k_pci 0000:01:00.0: enabling device (0000 -> 0002)
ath11k_pci 0000:01:00.0: MSI vectors: 32
ath11k_pci 0000:01:00.0: qca6390 hw2.0
ath11k_pci 0000:01:00.0: chip_id 0x0 chip_family 0xb board_id 0xff soc_id 0xffffffff
ath11k_pci 0000:01:00.0: fw_version 0x10121492 fw_build_timestamp 2021-11-04 11:23 fw_build_id
Signed-off-by: Jianhua Lu <lujianhua000@gmail.com>
---
changes in v2:
1. add ath11k-calibration-variant property.
.../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index ebea283f56ea..7a55e271c3ac 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -680,6 +680,25 @@ &pcie0_phy {
status = "okay";
};
+&pcieport0 {
+ wifi@0 {
+ compatible = "pci17cb,1101";
+ 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>;
+ vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>;
+ vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
+ vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
+
+ qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro";
+ };
+};
+
&pm8150_gpios {
vol_up_n: vol-up-n-state {
pins = "gpio6";
--
2.46.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node
2024-10-07 13:02 ` [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node Jianhua Lu
@ 2024-10-07 13:10 ` Jianhua Lu
2024-10-07 18:40 ` Jeff Johnson
1 sibling, 0 replies; 6+ messages in thread
From: Jianhua Lu @ 2024-10-07 13:10 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Kalle Valo, Jeff Johnson
Cc: linux-arm-msm, devicetree, linux-kernel, ath11k, Dmitry Baryshkov
sorry, I forget to CC Dmitry Baryshkov.
On Mon, Oct 07, 2024 at 09:02:50PM +0800, Jianhua Lu wrote:
> Add wifi node and this wifi module is connected to pice port.
> The following is qca6390 probe message:
> ath11k_pci 0000:01:00.0: Adding to iommu group 12
> ath11k_pci 0000:01:00.0: BAR 0 [mem 0x60400000-0x604fffff 64bit]: assigned
> ath11k_pci 0000:01:00.0: enabling device (0000 -> 0002)
> ath11k_pci 0000:01:00.0: MSI vectors: 32
> ath11k_pci 0000:01:00.0: qca6390 hw2.0
> ath11k_pci 0000:01:00.0: chip_id 0x0 chip_family 0xb board_id 0xff soc_id 0xffffffff
> ath11k_pci 0000:01:00.0: fw_version 0x10121492 fw_build_timestamp 2021-11-04 11:23 fw_build_id
>
> Signed-off-by: Jianhua Lu <lujianhua000@gmail.com>
> ---
> changes in v2:
> 1. add ath11k-calibration-variant property.
>
> .../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> index ebea283f56ea..7a55e271c3ac 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> @@ -680,6 +680,25 @@ &pcie0_phy {
> status = "okay";
> };
>
> +&pcieport0 {
> + wifi@0 {
> + compatible = "pci17cb,1101";
> + 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>;
> + vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>;
> + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
> + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
> +
> + qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro";
> + };
> +};
> +
> &pm8150_gpios {
> vol_up_n: vol-up-n-state {
> pins = "gpio6";
> --
> 2.46.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node
2024-10-07 13:02 ` [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node Jianhua Lu
2024-10-07 13:10 ` Jianhua Lu
@ 2024-10-07 18:40 ` Jeff Johnson
2024-10-08 0:08 ` Jianhua Lu
1 sibling, 1 reply; 6+ messages in thread
From: Jeff Johnson @ 2024-10-07 18:40 UTC (permalink / raw)
To: Jianhua Lu, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Kalle Valo, Jeff Johnson
Cc: linux-arm-msm, devicetree, linux-kernel, ath11k, Dmitry Baryshkov
On 10/7/2024 6:02 AM, Jianhua Lu wrote:
> Add wifi node and this wifi module is connected to pice port.
s/pici/pcie/ (or perhaps better: PCIe)
> The following is qca6390 probe message:
> ath11k_pci 0000:01:00.0: Adding to iommu group 12
> ath11k_pci 0000:01:00.0: BAR 0 [mem 0x60400000-0x604fffff 64bit]: assigned
> ath11k_pci 0000:01:00.0: enabling device (0000 -> 0002)
> ath11k_pci 0000:01:00.0: MSI vectors: 32
> ath11k_pci 0000:01:00.0: qca6390 hw2.0
> ath11k_pci 0000:01:00.0: chip_id 0x0 chip_family 0xb board_id 0xff soc_id 0xffffffff
> ath11k_pci 0000:01:00.0: fw_version 0x10121492 fw_build_timestamp 2021-11-04 11:23 fw_build_id
>
> Signed-off-by: Jianhua Lu <lujianhua000@gmail.com>
> ---
> changes in v2:
> 1. add ath11k-calibration-variant property.
>
> .../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> index ebea283f56ea..7a55e271c3ac 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> @@ -680,6 +680,25 @@ &pcie0_phy {
> status = "okay";
> };
>
> +&pcieport0 {
> + wifi@0 {
> + compatible = "pci17cb,1101";
> + 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>;
> + vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>;
> + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
> + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
> +
> + qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro";
Are you going to submit the board file per the guidance Dmitry provided?
Note that I am not up to speed on the firmware/board maintenance procedures so
we'll need to wait for Kalle to have bandwidth to handle the request (and show
me how he handles it).
/jeff
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node
2024-10-07 18:40 ` Jeff Johnson
@ 2024-10-08 0:08 ` Jianhua Lu
0 siblings, 0 replies; 6+ messages in thread
From: Jianhua Lu @ 2024-10-08 0:08 UTC (permalink / raw)
To: Jeff Johnson
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Kalle Valo, Jeff Johnson, linux-arm-msm, devicetree,
linux-kernel, ath11k, Dmitry Baryshkov
On Mon, Oct 07, 2024 at 11:40:48AM -0700, Jeff Johnson wrote:
> On 10/7/2024 6:02 AM, Jianhua Lu wrote:
> > Add wifi node and this wifi module is connected to pice port.
>
> s/pici/pcie/ (or perhaps better: PCIe)
>
Acked
> > The following is qca6390 probe message:
> > ath11k_pci 0000:01:00.0: Adding to iommu group 12
> > ath11k_pci 0000:01:00.0: BAR 0 [mem 0x60400000-0x604fffff 64bit]: assigned
> > ath11k_pci 0000:01:00.0: enabling device (0000 -> 0002)
> > ath11k_pci 0000:01:00.0: MSI vectors: 32
> > ath11k_pci 0000:01:00.0: qca6390 hw2.0
> > ath11k_pci 0000:01:00.0: chip_id 0x0 chip_family 0xb board_id 0xff soc_id 0xffffffff
> > ath11k_pci 0000:01:00.0: fw_version 0x10121492 fw_build_timestamp 2021-11-04 11:23 fw_build_id
> >
> > Signed-off-by: Jianhua Lu <lujianhua000@gmail.com>
> > ---
> > changes in v2:
> > 1. add ath11k-calibration-variant property.
> >
> > .../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 19 +++++++++++++++++++
> > 1 file changed, 19 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> > index ebea283f56ea..7a55e271c3ac 100644
> > --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> > @@ -680,6 +680,25 @@ &pcie0_phy {
> > status = "okay";
> > };
> >
> > +&pcieport0 {
> > + wifi@0 {
> > + compatible = "pci17cb,1101";
> > + 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>;
> > + vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>;
> > + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
> > + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
> > +
> > + qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro";
>
> Are you going to submit the board file per the guidance Dmitry provided?
I want to get comment for this patch, then send board file.
I have send board file to ath11k@lists.infradead.org now.
>
> Note that I am not up to speed on the firmware/board maintenance procedures so
> we'll need to wait for Kalle to have bandwidth to handle the request (and show
> me how he handles it).
>
> /jeff
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add bluetooth node
2024-10-07 13:02 [PATCH v2 1/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add qca6390-pmu node Jianhua Lu
2024-10-07 13:02 ` [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node Jianhua Lu
@ 2024-10-07 13:02 ` Jianhua Lu
1 sibling, 0 replies; 6+ messages in thread
From: Jianhua Lu @ 2024-10-07 13:02 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Kalle Valo, Jeff Johnson
Cc: linux-arm-msm, devicetree, linux-kernel, ath11k, Jianhua Lu,
Dmitry Baryshkov
Add bluetooth node and this bluetooth module is connected to uart.
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Jianhua Lu <lujianhua000@gmail.com>
---
changes in v2:
1. pick up Dmitry Baryshkov's Reviewed-by
.../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index 7a55e271c3ac..100607da42ad 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -30,6 +30,10 @@ / {
qcom,msm-id = <QCOM_ID_SM8250 0x20001>; /* SM8250 v2.1 */
qcom,board-id = <0x10008 0>;
+ aliases {
+ serial0 = &uart6;
+ };
+
chosen {
#address-cells = <2>;
#size-cells = <2>;
@@ -799,6 +803,21 @@ wlan_en_state: wlan-default-state {
};
};
+&uart6 {
+ status = "okay";
+
+ bluetooth {
+ compatible = "qcom,qca6390-bt";
+
+ vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
+ vddaon-supply = <&vreg_pmu_aon_0p59>;
+ vddbtcmx-supply = <&vreg_pmu_btcmx_0p85>;
+ vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
+ vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
+ vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>;
+ };
+};
+
&usb_1 {
/* USB 2.0 only */
qcom,select-utmi-as-pipe-clk;
--
2.46.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-08 0:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-07 13:02 [PATCH v2 1/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add qca6390-pmu node Jianhua Lu
2024-10-07 13:02 ` [PATCH v2 2/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add wifi node Jianhua Lu
2024-10-07 13:10 ` Jianhua Lu
2024-10-07 18:40 ` Jeff Johnson
2024-10-08 0:08 ` Jianhua Lu
2024-10-07 13:02 ` [PATCH v2 3/3] arm64: dts: qcom: sm8250-xiaomi-elish: Add bluetooth node Jianhua Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).