Skip to content

Commit e0e19f7

Browse files
committed
FIXUP: arm64: dts: qcom: monaco-evk: Restore Bluetooth nodes dropped in common dtsi refactor
Commit 8fad712 ("FROMLIST: arm64: dts: qcom: monaco-evk: Extract common EVK hardware into shared dtsi") refactored monaco-evk.dts into a new shared monaco-evk-common.dtsi to support the monaco-ac-evk board variant. Despite claiming "No functional change intended", the commit accidentally omitted three Bluetooth-critical pieces that were present in the original monaco-evk.dts: 1. The 'serial1 = &uart2' alias in the aliases block 2. The vreg_dcin_12v and vreg_wcn_3p3 fixed regulators in the root node (vreg_wcn_3p3 is the power supply for the WCN6855 BT chip, and depends on vreg_dcin_12v as its vin-supply) 3. The &uart2 node containing the bluetooth child node with compatible = "qcom,wcn6855-bt" and all its regulator supplies As a result, Bluetooth stopped working on monaco-evk devices after tag qcom-6.18.y-20260414 which included PR qualcomm-linux#415. Restore all three missing pieces into monaco-evk-common.dtsi so that both monaco-evk and monaco-ac-evk boards correctly inherit the WCN6855 Bluetooth hardware description via the shared dtsi. Fixes: 8fad712 ("FROMLIST: arm64: dts: qcom: monaco-evk: Extract common EVK hardware into shared dtsi") Signed-off-by: Salendarsingh Gaud <sgaud@qti.qualcomm.com>
1 parent bf62c12 commit e0e19f7

1 file changed

Lines changed: 42 additions & 0 deletions

File tree

arch/arm64/boot/dts/qcom/monaco-evk-common.dtsi

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
ethernet0 = &ethernet0;
1717
i2c1 = &i2c1;
1818
serial0 = &uart7;
19+
serial1 = &uart2;
1920
serial2 = &uart6;
2021
};
2122

@@ -167,6 +168,29 @@
167168
pinctrl-0 = <&cam2_avdd_2v8_en_default>;
168169
pinctrl-names = "default";
169170
};
171+
172+
vreg_dcin_12v: regulator-dcin-12v {
173+
compatible = "regulator-fixed";
174+
175+
regulator-name = "VREG_DCIN_12V";
176+
regulator-min-microvolt = <12000000>;
177+
regulator-max-microvolt = <12000000>;
178+
179+
regulator-boot-on;
180+
regulator-always-on;
181+
};
182+
183+
vreg_wcn_3p3: regulator-wcn-3p3 {
184+
compatible = "regulator-fixed";
185+
186+
regulator-name = "VREG_WCN_3P3";
187+
regulator-min-microvolt = <3300000>;
188+
regulator-max-microvolt = <3300000>;
189+
190+
vin-supply = <&vreg_dcin_12v>;
191+
192+
regulator-boot-on;
193+
};
170194
};
171195

172196
&apps_rsc {
@@ -837,6 +861,24 @@
837861
};
838862
};
839863

864+
&uart2 {
865+
status = "okay";
866+
867+
bluetooth: bluetooth {
868+
compatible = "qcom,wcn6855-bt";
869+
max-speed = <3200000>;
870+
871+
vddrfacmn-supply = <&vreg_wcn_3p3>;
872+
vddaon-supply = <&vreg_wcn_3p3>;
873+
vddwlcx-supply = <&vreg_wcn_3p3>;
874+
vddwlmx-supply = <&vreg_wcn_3p3>;
875+
vddbtcmx-supply = <&vreg_wcn_3p3>;
876+
vddrfa0p8-supply = <&vreg_wcn_3p3>;
877+
vddrfa1p2-supply = <&vreg_wcn_3p3>;
878+
vddrfa1p8-supply = <&vreg_wcn_3p3>;
879+
};
880+
};
881+
840882
&uart6 {
841883
status = "okay";
842884
};

0 commit comments

Comments
 (0)