From 08e6e7f5f6cdf5b2f75183d5b3e267dbfa3e5f62 Mon Sep 17 00:00:00 2001 From: Wei Deng Date: Wed, 19 Aug 2026 10:45:30 +0530 Subject: [PATCH] FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file of_graph_is_present() only checks for the presence of a 'port' child node, not whether remote-endpoint is actually connected. Adding empty port anchor nodes to monaco.dtsi caused hci_qca to enter the M.2 pwrseq probe path on all monaco-based boards, including qcs8300-ride which has a soldered WCN6855 and no M.2 Key E connector. This broke BT initialization on qcs8300-ride. Fix this by moving the port/endpoint nodes from monaco.dtsi into the monaco-evk.dts board file where the M.2 connector is actually present, so that of_graph_is_present() only returns true for boards that have an M.2 Key E connector described. Fixes: 2479c6b2096e ("FROMLIST: arm64: dts: qcom: monaco: Add graph port/endpoint anchors to pcieport0 and uart2") Link: https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/ Signed-off-by: Wei Deng --- arch/arm64/boot/dts/qcom/monaco-evk.dts | 16 +++++++++++----- arch/arm64/boot/dts/qcom/monaco.dtsi | 8 -------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/monaco-evk.dts b/arch/arm64/boot/dts/qcom/monaco-evk.dts index 86c0084a8900..b6c066b3c346 100644 --- a/arch/arm64/boot/dts/qcom/monaco-evk.dts +++ b/arch/arm64/boot/dts/qcom/monaco-evk.dts @@ -80,8 +80,12 @@ }; }; -&pcieport0_ep { - remote-endpoint = <&m2_e_pcie_ep>; +&pcieport0 { + port { + pcieport0_ep: endpoint { + remote-endpoint = <&m2_e_pcie_ep>; + }; + }; }; &sdhc_1 { @@ -97,8 +101,10 @@ &uart2 { status = "okay"; -}; -&uart2_ep { - remote-endpoint = <&m2_e_uart_ep>; + port { + uart2_ep: endpoint { + remote-endpoint = <&m2_e_uart_ep>; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/monaco.dtsi b/arch/arm64/boot/dts/qcom/monaco.dtsi index f6fb73dc6f11..4fd0d1c24614 100644 --- a/arch/arm64/boot/dts/qcom/monaco.dtsi +++ b/arch/arm64/boot/dts/qcom/monaco.dtsi @@ -1262,10 +1262,6 @@ power-domains = <&rpmhpd RPMHPD_CX>; operating-points-v2 = <&qup_opp_table>; status = "disabled"; - - port { - uart2_ep: endpoint {}; - }; }; i2c3: i2c@98c000 { @@ -2484,10 +2480,6 @@ #size-cells = <2>; ranges; phys = <&pcie0_phy>; - - port { - pcieport0_ep: endpoint {}; - }; }; };