Skip to contentSkip to conversation

Revert "arm64: dts: qcom: qrb5165-rb5: add the Bluetooth node"

PATCH In review Bartosz Golaszewski 2 participants 3 messages Jan 30, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "arm64: dts: qcom: qrb5165-rb5: add the Bluetooth node"

From: Bartosz Golaszewski <[email protected]>

This reverts commit 71a73864e144aadaa582fe8296ef73fcf3ea7377.

The bluetooth module of the QCA6391 should be represented as consuming the power outputs of the PMU and not the regulators that are PMU's inputs. We will be able to model it this way (together with the WLAN module) once the pwrseq subsystem gets upstream with a dedicated driver for the PMU.

Thankfully this change has no corresponding DT bindings yet so we can safely revert adding the bluetooth node.

Fixes 71a73864e144 ("arm64: dts: qcom: qrb5165-rb5: add the Bluetooth node")
---
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 29 ------------------------
 1 file changed, 29 deletions(-)
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +0 -29
index cd0db4f31d4a..4501c00d124b 100644
@@ -23,7 +23,6 @@ / {
 
 	aliases {
 		serial0 = &uart12;
-		serial1 = &uart6;
 		sdhc2 = &sdhc_2;
 	};
 
@@ -1264,14 +1263,6 @@ &tlmm {
 		"HST_WLAN_UART_TX",
 		"HST_WLAN_UART_RX";
 
-	bt_en_state: bt-default-state {
-		pins = "gpio21";
-		function = "gpio";
-		drive-strength = <16>;
-		output-low;
-		bias-pull-up;
-	};
-
 	lt9611_irq_pin: lt9611-irq-state {
 		pins = "gpio63";
 		function = "gpio";
@@ -1305,26 +1296,6 @@ sdc2_card_det_n: sd-card-det-n-state {
 	};
 };
 
-&uart6 {
-	status = "okay";
-
-	bluetooth {
-		compatible = "qcom,qca6390-bt";
-
-		pinctrl-names = "default";
-		pinctrl-0 = <&bt_en_state>;
-
-		enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
-
-		vddio-supply = <&vreg_s4a_1p8>;
-		vddpmu-supply = <&vreg_s2f_0p95>;
-		vddaon-supply = <&vreg_s6a_0p95>;
-		vddrfa0p9-supply = <&vreg_s2f_0p95>;
-		vddrfa1p3-supply = <&vreg_s8c_1p3>;
-		vddrfa1p9-supply = <&vreg_s5a_1p9>;
-	};
-};
-
 &uart12 {
 	status = "okay";
 };
Signature · 1 line
2.40.1
#1 lore raw
Quoted 10 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

This reverts commit 71a73864e144aadaa582fe8296ef73fcf3ea7377.

The bluetooth module of the QCA6391 should be represented as consuming the power outputs of the PMU and not the regulators that are PMU's inputs. We will be able to model it this way (together with the WLAN module) once the pwrseq subsystem gets upstream with a dedicated driver for the PMU.

Quoted 4 lines

Thankfully this change has no corresponding DT bindings yet so we can safely revert adding the bluetooth node.

Fixes 71a73864e144 ("arm64: dts: qcom: qrb5165-rb5: add the Bluetooth node")

I don't think that dropping more-or-less correct DTS nodes is a fix. A fix could be changing the less-correct DTS into fully-correct DTS.

Best regards,
Krzysztof

#2 lore raw
Quoted 12 lines · Krzysztof Kozlowski
Quoted 10 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

This reverts commit 71a73864e144aadaa582fe8296ef73fcf3ea7377.

The bluetooth module of the QCA6391 should be represented as consuming the power outputs of the PMU and not the regulators that are PMU's inputs. We will be able to model it this way (together with the WLAN module) once the pwrseq subsystem gets upstream with a dedicated driver for the PMU.

Quoted 8 lines
Quoted 4 lines

Thankfully this change has no corresponding DT bindings yet so we can safely revert adding the bluetooth node.

Fixes 71a73864e144 ("arm64: dts: qcom: qrb5165-rb5: add the Bluetooth node")

I don't think that dropping more-or-less correct DTS nodes is a fix. A fix could be changing the less-correct DTS into fully-correct DTS.

This node was added this merge window, the bindings didn't make it. It's not used anywhere AFAIK and a better version is coming.

I'm not going to insist but I think it's useless right now.

Bart