arm64: dts: qcom: lemans-evk: Enable WCN6855 BT via PCIe M.2 Key E connector
v3 cover arm64: dts: qcom: lemans-evk: Enable WCN6855 BT via PCIe M.2 Key E connector
This series enables the WCN6855 Bluetooth/WLAN module on the lemans EVK via the PCIe M.2 Key E connector.
Patch 1 adds the PCI-to-PCI bridge compatible to the lemans pcieport0 Root Port in the SoC dtsi, which is required to associate downstream M.2 connector graph endpoints with their PCI devices.
Patch 2 describes the M.2 Key E connector on lemans-evk and links it with PCIe RP0 and UART17 via graph ports/endpoints.
---
Changes in v3:
- Split the lemans.dtsi pcieport0 compatible into its own patch (Konrad)
- Send as a new thread, switch to b4 workflow (Konrad, Dmitry)
- Carry over Reviewed-by tags since the diff content is unchanged
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Collect Reviewed-by tag and reorganize the patch (Bartosz)
- Link to v1: https://lore.kernel.org/all/[email protected]/
---
Wei Deng (2):
arm64: dts: qcom: lemans: Add compatible to the PCIe Root Port
arm64: dts: qcom: lemans-evk: Describe the PCIe M.2 Key E connector
arch/arm64/boot/dts/qcom/lemans-evk.dts | 75 +++++++++++++++++++++++++++++++++ arch/arm64/boot/dts/qcom/lemans.dtsi | 1 + 2 files changed, 76 insertions(+)
---
base-commit: e503fdd88e7d8f1922426bca1602049de010a66c
change-id: 20260622-v3-lemans-split-5e372766ecb6
Best regards,
Signature · 1 line
Wei Deng <[email protected]>
PATCH v3 1/2 arm64: dts: qcom: lemans: Add compatible to the PCIe Root Port
Add 'compatible = "pciclass,0604"' to the pcieport0 node in lemans.dtsi to allow the PCI subsystem to associate the DT node with the PCI-to-PCI bridge device. This is required for downstream DT nodes (such as M.2 connectors described as graph endpoints of the Root Port) to be matched to PCI devices.
--- arch/arm64/boot/dts/qcom/lemans.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/lemans.dtsi +1 -0
@@ -2779,6 +2779,7 @@ pcie0: pcie@1c00000 { status = "disabled"; pcieport0: pcie@0 { + compatible = "pciclass,0604"; device_type = "pci"; reg = <0x0 0x0 0x0 0x0 0x0>; bus-range = <0x01 0xff>;
Signature · 1 line
2.34.1
PATCH v3 2/2 arm64: dts: qcom: lemans-evk: Describe the PCIe M.2 Key E connector
In reply to Wei DengThe lemans EVK has the PCIe M.2 Mechanical Key E connector to connect wireless connectivity cards over PCIe and UART interfaces. Hence, describe the connector node and link it with the PCIe 0 Root Port and UART17 nodes through graph port/endpoint.
The M.2 Key E connector is powered by a 3.3V fixed regulator (vreg_wcn_3p3) which is sourced from the board's 12V DC input rail (vreg_dcin_12v). Both regulators are always-on and are required by the pcie-m2-e-connector binding.
Also add the serial1 = &uart17 alias, which is required for the Bluetooth serdev device to be enumerated on the UART17 interface.
--- arch/arm64/boot/dts/qcom/lemans-evk.dts | 75 +++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+)
arch/arm64/boot/dts/qcom/lemans-evk.dts +75 -0
@@ -21,6 +21,7 @@ aliases { ethernet0 = ðernet0; mmc1 = &sdhc; serial0 = &uart10; + serial1 = &uart17; serial2 = &uart0; };
@@ -88,6 +89,38 @@ usb2_con_hs_ep: endpoint { }; }; + connector-3 { + compatible = "pcie-m2-e-connector"; + vpcie3v3-supply = <&vreg_wcn_3p3>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + m2_e_pcie_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&pcieport0_ep>; + }; + }; + + port@3 { + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + + m2_e_uart_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&uart17_ep>; + }; + }; + }; + }; + edp0-connector { compatible = "dp-connector"; label = "EDP0";
@@ -178,6 +211,17 @@ vmmc_sdc: regulator-vmmc-sdc { regulator-max-microvolt = <2950000>; }; + vreg_dcin_12v: regulator-dcin-12v { + compatible = "regulator-fixed"; + + regulator-name = "VREG_DCIN_12V"; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + + regulator-always-on; + regulator-boot-on; + }; + vreg_sdc: regulator-vreg-sdc { compatible = "regulator-gpio";
@@ -191,6 +235,19 @@ vreg_sdc: regulator-vreg-sdc { startup-delay-us = <100>; }; + + vreg_wcn_3p3: regulator-wcn-3p3 { + compatible = "regulator-fixed"; + + regulator-name = "VREG_WCN_3P3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + vin-supply = <&vreg_dcin_12v>; + + regulator-always-on; + regulator-boot-on; + }; }; &apps_rsc {
@@ -742,6 +799,14 @@ &pcie1_phy { status = "okay"; }; +&pcieport0 { + port { + pcieport0_ep: endpoint { + remote-endpoint = <&m2_e_pcie_ep>; + }; + }; +}; + &pmm8654au_0_pon_resin { linux,code = <KEY_VOLUMEDOWN>; status = "okay";
@@ -970,6 +1035,16 @@ &uart10 { status = "okay"; }; +&uart17 { + status = "okay"; + + port { + uart17_ep: endpoint { + remote-endpoint = <&m2_e_uart_ep>; + }; + }; +}; + &ufs_mem_hc { reset-gpios = <&tlmm 149 GPIO_ACTIVE_LOW>; vcc-supply = <&vreg_l8a>;
Signature · 1 line
2.34.1
Re: [PATCH v3 2/2] arm64: dts: qcom: lemans-evk: Describe the PCIe M.2 Key E connector
Quoted 10 lines · Wei Deng
The lemans EVK has the PCIe M.2 Mechanical Key E connector to connect wireless connectivity cards over PCIe and UART interfaces. Hence, describe the connector node and link it with the PCIe 0 Root Port and UART17 nodes through graph port/endpoint.
The M.2 Key E connector is powered by a 3.3V fixed regulator (
vreg_wcn_3p3) which is sourced from the board's 12V DC input rail (vreg_dcin_12v). Both regulators are always-on and are required by the pcie-m2-e-connector binding.
Quoted 8 lines
Also add the serial1 = &uart17 alias, which is required for the Bluetooth serdev device to be enumerated on the UART17 interface.
Reviewed-by Bartosz Golaszewski <[email protected]>Reviewed-by Dmitry Baryshkov <[email protected]>Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Wei Deng <[email protected]>---
Konrad
Quoted 8 lines · Wei Deng
This series enables the WCN6855 Bluetooth/WLAN module on the lemans EVK via the PCIe M.2 Key E connector.
Patch 1 adds the PCI-to-PCI bridge compatible to the lemans pcieport0 Root Port in the SoC dtsi, which is required to associate downstream M.2 connector graph endpoints with their PCI devices.
[...]
Applied, thanks!
[1/2] arm64: dts: qcom: lemans: Add compatible to the PCIe Root Port
commit: 4af0537223d511a903f0a2a6b63d712b63184a08
[2/2] arm64: dts: qcom: lemans-evk: Describe the PCIe M.2 Key E connector
commit: 5bbb7dadda0cc4b327a1fa2fd055dcb2a6a8ee37Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>