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

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

Posted by Luca Weiss 2 weeks, 4 days ago

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>
---
 arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index a3c2b26736f4..3964aae47fd4 100644
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -1019,12 +1019,14 @@ &qup_uart1_cts {
 	 * 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 @@ &qup_uart1_rx {
 	 * 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;
 };
 

---
base-commit: de79886ae0ce739608514f6b1ae91c14c6a9e600
change-id: 20260319-fp4-uart1-fix-9fe390294499

Best regards,
-- 
Luca Weiss <luca.weiss@fairphone.com>

Re: [PATCH] arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl

Posted by Bjorn Andersson 1 week, 6 days ago

On Thu, 19 Mar 2026 09:55:00 +0100, Luca Weiss wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl
      commit: 5f80d68959dd1bff70fd0abea8a69f507f204287

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH] arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl

Posted by Konrad Dybcio 1 week, 6 days ago

On 3/19/26 9:55 AM, Luca Weiss wrote:
> 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>

Konrad

Re: [PATCH] arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl

Posted by Konrad Dybcio 1 week, 6 days ago

On 3/19/26 9:55 AM, Luca Weiss wrote:
> 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>
> ---

FWIW it may be that almost no one will use this UART for anything else
than bluetooth, so I'm not entirely against just smashing these into
the common DTSI..

Konrad

Re: [PATCH] arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl

Posted by Conor Dooley 2 weeks, 3 days ago

On Thu, Mar 19, 2026 at 09:55:00AM +0100, Luca Weiss wrote:
> 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: Conor Dooley <conor.dooley@microchip.com>

Thanks Luca.

> ---
>  arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> index a3c2b26736f4..3964aae47fd4 100644
> --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> @@ -1019,12 +1019,14 @@ &qup_uart1_cts {
>  	 * 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 @@ &qup_uart1_rx {
>  	 * 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;
>  };
>  
> 
> ---
> base-commit: de79886ae0ce739608514f6b1ae91c14c6a9e600
> change-id: 20260319-fp4-uart1-fix-9fe390294499
> 
> Best regards,
> -- 
> Luca Weiss <luca.weiss@fairphone.com>
>