[1/7] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux

Message ID 20221016143300.1738550-2-caleb@connolly.tech
State New
Headers
Series arm64: dts: qcom: sdm845: commonize bluetooth pinconf |

Commit Message

Caleb Connolly Oct. 16, 2022, 2:33 p.m. UTC
  The 4-pin configuration for UART6 is used for all or almost all SDM845
devices with built in Bluetooth. Move the pinmux configuration to
sdm845.dtsi in preparation to be removed from individual devices in
future patches.

Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

--
2.38.0
  

Comments

Krzysztof Kozlowski Oct. 16, 2022, 2:57 p.m. UTC | #1
On 16/10/2022 10:33, Caleb Connolly wrote:
> The 4-pin configuration for UART6 is used for all or almost all SDM845
> devices with built in Bluetooth. Move the pinmux configuration to
> sdm845.dtsi in preparation to be removed from individual devices in
> future patches.
> 
> Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Signed-off-by: Caleb Connolly <caleb@connolly.tech>
> ---
>  arch/arm64/boot/dts/qcom/sdm845.dtsi | 23 +++++++++++++++++++++++

The move should happen here. Otherwise you add new nodes and we cannot
see in one place how the old nodes look like.

>  1 file changed, 23 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index f0e286715d1b..8c69942b969b 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -2971,6 +2971,29 @@ pinmux {
>  				};
>  			};
> 
> +			qup_uart6_4pin: qup-uart6-4pin {

-state suffix

> +				pinmux {
> +					pins = "gpio45", "gpio46", "gpio47", "gpio48";

Drop pinmux node entirely and put function to others.

> +					function = "qup6";
> +				};
> +
> +				cts {

-pins suffix

> +					pins = "gpio45";
> +					bias-pull-down;
> +				};
> +
> +				rts-tx {

-pins suffix

> +					pins = "gpio46", "gpio47";
> +					drive-strength = <2>;
> +					bias-disable;
> +				};
> +
> +				rx {

-pins suffix

> +					pins = "gpio48";
> +					bias-pull-up;
> +				};
> +			};
> +
>  			qup_uart7_default: qup-uart7-default {
>  				pinmux {
>  					pins = "gpio95", "gpio96";
> --
> 2.38.0
> 
> 

Best regards,
Krzysztof
  

Patch

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index f0e286715d1b..8c69942b969b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -2971,6 +2971,29 @@  pinmux {
 				};
 			};

+			qup_uart6_4pin: qup-uart6-4pin {
+				pinmux {
+					pins = "gpio45", "gpio46", "gpio47", "gpio48";
+					function = "qup6";
+				};
+
+				cts {
+					pins = "gpio45";
+					bias-pull-down;
+				};
+
+				rts-tx {
+					pins = "gpio46", "gpio47";
+					drive-strength = <2>;
+					bias-disable;
+				};
+
+				rx {
+					pins = "gpio48";
+					bias-pull-up;
+				};
+			};
+
 			qup_uart7_default: qup-uart7-default {
 				pinmux {
 					pins = "gpio95", "gpio96";