[5/7] arm64: dts: qcom: sdm845-xiaomi-beryllium: commonize uart6 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 <[e-mail]>
---
 .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

--
2.38.0

Patch

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
index 82c27f90d300..1646db2328d4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
@@ -35,7 +35,7 @@  / {
 	qcom,msm-id = <321 0x20001>;

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

 	gpio-keys {
@@ -481,6 +481,8 @@  wcd_intr_default: wcd_intr_default {
 &uart6 {
 	status = "okay";

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

@@ -567,28 +569,3 @@  &wifi {
 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
 	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
 };
-
-/* PINCTRL - additions to nodes defined in sdm845.dtsi */
-
-&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;
-	};
-};