[3/7] arm64: dts: qcom: sdm845-db845c: commonize uart6 pinconf

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

Commit Message

Caleb Connolly Oct. 16, 2022, 2:34 p.m. UTC
  Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias
name.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 27 +++-------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

--
2.38.0
  

Patch

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index c6e2c571b452..215dd8098a44 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -22,7 +22,7 @@  / {

 	aliases {
 		serial0 = &uart9;
-		hsuart0 = &uart6;
+		serial1 = &uart6;
 	};

 	chosen {
@@ -986,6 +986,8 @@  &uart3 {
 &uart6 {
 	status = "okay";

+	pinctrl-0 = <&qup_uart6_4pin>;
+
 	bluetooth {
 		compatible = "qcom,wcn3990-bt";

@@ -1141,29 +1143,6 @@  pinconf {
 	};
 };

-&qup_uart6_default {
-	pinmux {
-		pins = "gpio45", "gpio46", "gpio47", "gpio48";
-		function = "qup6";
-	};
-
-	cts {
-		pins = "gpio45";
-		bias-disable;
-	};
-
-	rts-tx {
-		pins = "gpio46", "gpio47";
-		drive-strength = <2>;
-		bias-disable;
-	};
-
-	rx {
-		pins = "gpio48";
-		bias-pull-up;
-	};
-};
-
 &qup_uart9_default {
 	pinconf-tx {
 		pins = "gpio4";