From 18ed667ccf75d243ea8f9b0b6d112737250ea480 Mon Sep 17 00:00:00 2001
From: Aniket Randive <arandive@qti.qualcomm.com>
Date: Thu, 2 Jun 2022 14:32:34 +0530
Subject: [PATCH] ARM: dts: msm: Add pinctrl property for 4W UART node

Add the "shutdown" config for 4W UART node and correct the
compatible field for GNSS UART node on SM8150 target.

Change-Id: Ifcf6d77d844cd5328151cf8ae1880a8b830eefd8
---
 qcom/sm8150-pinctrl.dtsi | 26 +++++++++++++-------------
 qcom/sm8150-qupv3.dtsi   |  6 ++++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/qcom/sm8150-pinctrl.dtsi b/qcom/sm8150-pinctrl.dtsi
index d5ed5e8f..978ab2ab 100644
--- a/qcom/sm8150-pinctrl.dtsi
+++ b/qcom/sm8150-pinctrl.dtsi
@@ -1639,6 +1639,19 @@
 		};
 
 		qupv3_se17_4uart_pins: qupv3_se17_4uart_pins {
+			qupv3_se17_default_tx: qupv3_se17_default_tx {
+				mux {
+					pins = "gpio45";
+					function = "gpio";
+				};
+
+				config {
+					pins = "gpio45";
+					drive-strength = <2>;
+					bias-pull-up;
+				};
+			};
+
 			qupv3_se17_default_ctsrtsrx:
 				qupv3_se17_default_ctsrtsrx {
 				mux {
@@ -1653,19 +1666,6 @@
 				};
 			};
 
-			qupv3_se17_default_tx: qupv3_se17_default_tx {
-				mux {
-					pins = "gpio45";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio45";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
 			qupv3_se17_ctsrx: qupv3_se17_ctsrx {
 				mux {
 					pins = "gpio43", "gpio46";
diff --git a/qcom/sm8150-qupv3.dtsi b/qcom/sm8150-qupv3.dtsi
index a6fff743..be6c9eb2 100644
--- a/qcom/sm8150-qupv3.dtsi
+++ b/qcom/sm8150-qupv3.dtsi
@@ -533,11 +533,11 @@
 
 		/* GNSS UART Instance */
 		qupv3_se9_2uart: qcom,qup_uart@a84000 {
-			compatible = "qcom,geni-debug-uart";
+			compatible = "qcom,msm-geni-serial-hs";
 			reg = <0xa84000 0x4000>;
 			reg-names = "se_phys";
 			interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-			clock-names = "se";
+			clock-names = "se-clk";
 			clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
 			interconnect-names = "qup-core", "qup-config", "qup-memory";
 			interconnects =
@@ -941,6 +941,8 @@
 						<&qupv3_se17_tx>;
 			pinctrl-2 = <&qupv3_se17_ctsrx>, <&qupv3_se17_rts>,
 						<&qupv3_se17_tx>;
+			pinctrl-3 = <&qupv3_se17_default_ctsrtsrx>,
+						<&qupv3_se17_default_tx>;
 			qcom,wakeup-byte = <0xFD>;
 			status = "disabled";
 		};