Skip to content

Commit 7f8365e

Browse files
lweiss-fairphonegregkh
authored andcommitted
arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl
[ Upstream commit be7c1ba ] 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: c4ef464 ("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 1327f28 commit 7f8365e

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,12 +953,14 @@
953953
* the Bluetooth module drives the pin in either
954954
* direction or leaves the pin fully unpowered.
955955
*/
956+
/delete-property/ bias-disable;
956957
bias-bus-hold;
957958
};
958959

959960
&qup_uart1_rts {
960961
/* We'll drive RTS, so no pull */
961962
drive-strength = <2>;
963+
/delete-property/ bias-pull-down;
962964
bias-disable;
963965
};
964966

@@ -969,12 +971,14 @@
969971
* in tri-state (module powered off or not driving the
970972
* signal yet).
971973
*/
974+
/delete-property/ bias-disable;
972975
bias-pull-up;
973976
};
974977

975978
&qup_uart1_tx {
976979
/* We'll drive TX, so no pull */
977980
drive-strength = <2>;
981+
/delete-property/ bias-pull-up;
978982
bias-disable;
979983
};
980984

0 commit comments

Comments
 (0)