[PATCH 0/7] arm64: dts: qcom: sdm845: commonize bluetooth pinconf

[PATCH 0/7] arm64: dts: qcom: sdm845: commonize bluetooth pinconf

[Caleb Connolly]

This series commonises the 4-pin pinconf used by almost all devices which have have
Bluetooth on uart6 and removes the node from individual device DTS files.

It also updates the old hsuart alias definitions to serial1. I'm happy to drop this if it
may causes issues with userspace, but it seemed to make sense to throw in while we're at it.

This is a followup to Dmitry's suggestion on an earlier patch:
https://lore.kernel.org/all/CAA8EJpqz32_LxmBVbcLt0sV=e1JzGtWEmMsKsQNoZzuGgLWbBQ@mail.gmail.com/

Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Caleb Connolly (6):
  arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux
  arm64: dts: qcom: sdm845-cheza: commonize uart6 pinconf
  arm64: dts: qcom: sdm845-db845c: commonize uart6 pinconf
  arm64: dts: qcom: sdm845-oneplus-common: commonize uart6 pinconf
  arm64: dts: qcom: sdm845-xiaomi-beryllium: commonize uart6 pinconf
  arm64: dts: qcom: sdm845-xiaomi-polaris: commonize uart6 pinconf

Dylan Van Assche (1):
  arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth firmware loading

 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi    | 39 ++-----------------
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts    | 27 ++-----------
 .../boot/dts/qcom/sdm845-oneplus-common.dtsi  | 30 ++------------
 .../boot/dts/qcom/sdm845-shift-axolotl.dts    |  9 +++++
 .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 29 ++------------
 .../boot/dts/qcom/sdm845-xiaomi-polaris.dts   | 27 +------------
 arch/arm64/boot/dts/qcom/sdm845.dtsi          | 23 +++++++++++
 7 files changed, 46 insertions(+), 138 deletions(-)

--
2.38.0

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

[Caleb Connolly]

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(+)

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";
--
2.38.0

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

[Krzysztof Kozlowski]

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