From f4aa5901cf7423708fc8df97705bd6395f7a69bf Mon Sep 17 00:00:00 2001
From: Vandhiadevan Karunamoorthy <vkarunam@codeaurora.org>
Date: Fri, 29 May 2020 14:46:41 +0530
Subject: [PATCH] arm: dts: ipq5018: Update gpio config for MP02.1.

This change include setting Gpio 20 & 21 to default 0xC1
value in order to make gpio 28 & 29 works as uart in mp02.1 rdp

Signed-off-by: Md Sadre Alam <mdalam@codeaurora.org>
Change-Id: I5fd482669c8429f930677f6eb9f1fdc191c7b2a6
Signed-off-by: Vandhiadevan Karunamoorthy <vkarunam@codeaurora.org>
---
 arch/arm/dts/ipq5018-db-mp02.1.dts | 53 +++++++++-------------------
 arch/arm/dts/ipq5018-mp02.1.dts    | 56 ++++++++++--------------------
 2 files changed, 36 insertions(+), 73 deletions(-)

diff --git a/arch/arm/dts/ipq5018-db-mp02.1.dts b/arch/arm/dts/ipq5018-db-mp02.1.dts
index 514e8a7e21..409488d37d 100644
--- a/arch/arm/dts/ipq5018-db-mp02.1.dts
+++ b/arch/arm/dts/ipq5018-db-mp02.1.dts
@@ -21,27 +21,35 @@
 
 	aliases {
 		console = "/serial@78AF000";
-		mmc = "/sdhci@7804000";
-		i2c0 = "/i2c@78b6000";
-		gmac_gpio = "/gmac_gpio";
-		usb0 = "/xhci@8a00000";
-		pci0 = "/pci@80000000";
-		pci1 = "/pci@a0000000";
 	};
 
 	console: serial@78AF000 {
 		status = "ok";
 		serial_gpio {
+			blsp0_mux_uart_rx {
+				gpio = <20>;
+				func = <0>;
+				pull = <GPIO_PULL_DOWN>;
+				drvstr = <GPIO_8MA>;
+				od_en = <GPIO_OD_DISABLE>;
+			};
+			blsp0_mux_uart_tx {
+				gpio = <21>;
+				func = <0>;
+				pull = <GPIO_PULL_DOWN>;
+				drvstr = <GPIO_8MA>;
+				od_en = <GPIO_OD_DISABLE>;
+			};
 			blsp0_uart_rx {
 				gpio = <28>;
-				func = <1>;
-				pull = <GPIO_PULL_DOWN>;
+				func = <3>;
+				pull = <GPIO_NO_PULL>;
 				drvstr = <GPIO_8MA>;
 				od_en = <GPIO_OD_DISABLE>;
 			};
 			blsp0_uart_tx {
 				gpio = <29>;
-				func = <1>;
+				func = <3>;
 				pull = <GPIO_NO_PULL>;
 				drvstr = <GPIO_8MA>;
 				od_en = <GPIO_OD_DISABLE>;
@@ -49,32 +57,6 @@
 		};
 	};
 
-	pci0: pci@80000000 {
-		status = "ok";
-		pci_gpio {
-			pcie_rst_n_5G {
-				gpio = <15>;
-				func = <0>;
-				pull = <GPIO_NO_PULL>;
-				od_en = <GPIO_OD_DISABLE>;
-				drvstr = <GPIO_8MA>;
-			};
-		};
-	};
-
-	pci1: pci@a0000000 {
-		status = "ok";
-		pci_gpio {
-			pcie_rst_n_6G {
-				gpio = <27>;
-				func = <0>;
-				pull = <GPIO_NO_PULL>;
-				od_en = <GPIO_OD_DISABLE>;
-				drvstr = <GPIO_8MA>;
-			};
-		};
-	};
-
 	gmac_cfg {
 		gephy_led = <46>;
 
@@ -86,5 +68,4 @@
 		};
 	};
 
-
 };
diff --git a/arch/arm/dts/ipq5018-mp02.1.dts b/arch/arm/dts/ipq5018-mp02.1.dts
index de592c696c..dc488c97e5 100644
--- a/arch/arm/dts/ipq5018-mp02.1.dts
+++ b/arch/arm/dts/ipq5018-mp02.1.dts
@@ -21,27 +21,35 @@
 
 	aliases {
 		console = "/serial@78AF000";
-		mmc = "/sdhci@7804000";
-		i2c0 = "/i2c@78b6000";
-		gmac_gpio = "/gmac_gpio";
-		usb0 = "/xhci@8a00000";
-		pci0 = "/pci@80000000";
-		pci1 = "/pci@a0000000";
 	};
 
 	console: serial@78AF000 {
 		status = "ok";
 		serial_gpio {
+			blsp0_mux_uart_rx {
+				gpio = <20>;
+				func = <0>;
+				pull = <GPIO_PULL_DOWN>;
+				drvstr = <GPIO_8MA>;
+				od_en = <GPIO_OD_DISABLE>;
+			};
+			blsp0_mux_uart_tx {
+				gpio = <21>;
+				func = <0>;
+				pull = <GPIO_PULL_DOWN>;
+				drvstr = <GPIO_8MA>;
+				od_en = <GPIO_OD_DISABLE>;
+			};
 			blsp0_uart_rx {
 				gpio = <28>;
-				func = <1>;
-				pull = <GPIO_PULL_DOWN>;
+				func = <3>;
+				pull = <GPIO_NO_PULL>;
 				drvstr = <GPIO_8MA>;
 				od_en = <GPIO_OD_DISABLE>;
 			};
 			blsp0_uart_tx {
 				gpio = <29>;
-				func = <1>;
+				func = <3>;
 				pull = <GPIO_NO_PULL>;
 				drvstr = <GPIO_8MA>;
 				od_en = <GPIO_OD_DISABLE>;
@@ -49,35 +57,9 @@
 		};
 	};
 
-	pci0: pci@80000000 {
-		status = "ok";
-		pci_gpio {
-			pcie_rst_n_5G {
-				gpio = <15>;
-				func = <0>;
-				pull = <GPIO_NO_PULL>;
-				od_en = <GPIO_OD_DISABLE>;
-				drvstr = <GPIO_8MA>;
-			};
-		};
-	};
-
-	pci1: pci@a0000000 {
-		status = "ok";
-		pci_gpio {
-			pcie_rst_n_6G {
-				gpio = <27>;
-				func = <0>;
-				pull = <GPIO_NO_PULL>;
-				od_en = <GPIO_OD_DISABLE>;
-				drvstr = <GPIO_8MA>;
-			};
-		};
-	};
-
 	gmac_cfg {
-		gephy_led = <46>
-;
+		gephy_led = <46>;
+
 		gmac1_cfg {
 			unit = <0>;
 			base = <0x39C00000>;