arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl

The pinctrl nodes from sm6350.dtsi already contain a bias-* property, so
that needs to be deleted, otherwise the dtb will contain two conflicting
bias-* properties.

Reported-by: Conor Dooley <conor@kernel.org>
Closes: https://lore.kernel.org/r/20260310-maritime-silly-05e7b7e03aa6@spud/
Fixes: c4ef464b24c5 ("arm64: dts: qcom: sm7225-fairphone-fp4: Add Bluetooth")
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20260319-fp4-uart1-fix-v1-1-f6b3fedef583@fairphone.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index a3c2b26736f471ee47c0a81c5b92758edb8a4aac..3964aae47fd4e99367ffb18f7bd9a757b7daefa0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -1019,12 +1019,14 @@
         * the Bluetooth module drives the pin in either
         * direction or leaves the pin fully unpowered.
         */
+       /delete-property/ bias-disable;
        bias-bus-hold;
 };
 
 &qup_uart1_rts {
        /* We'll drive RTS, so no pull */
        drive-strength = <2>;
+       /delete-property/ bias-pull-down;
        bias-disable;
 };
 
@@ -1035,12 +1037,14 @@
         * in tri-state (module powered off or not driving the
         * signal yet).
         */
+       /delete-property/ bias-disable;
        bias-pull-up;
 };
 
 &qup_uart1_tx {
        /* We'll drive TX, so no pull */
        drive-strength = <2>;
+       /delete-property/ bias-pull-up;
        bias-disable;
 };