From 3b56bd8af113b2fac45c374261919857a94ebe69 Mon Sep 17 00:00:00 2001
From: Vandhiadevan Karunamoorthy <vkarunam@codeaurora.org>
Date: Mon, 23 Aug 2021 22:22:39 +0530
Subject: [PATCH] dts: arm: ipq9574: Add BLSP3 I2C support

This changes add BLSP3 I2C and remove BLSP5 I2C.

Change-Id: I532da3733a170e78aaaeb4aba8faf1770cdfa97b
Signed-off-by: Vandhiadevan Karunamoorthy <vkarunam@codeaurora.org>
---
 arch/arm/dts/ipq9574-al01-c1.dts    |  1 +
 arch/arm/dts/ipq9574-al02-c1.dts    | 22 +-------------
 arch/arm/dts/ipq9574-db-al01-c1.dts |  2 +-
 arch/arm/dts/ipq9574-db-al02-c1.dts |  2 +-
 arch/arm/dts/ipq9574-soc.dtsi       | 46 +++++++++++++++++++++++++++--
 5 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/arch/arm/dts/ipq9574-al01-c1.dts b/arch/arm/dts/ipq9574-al01-c1.dts
index 9c58486252..49a215709d 100644
--- a/arch/arm/dts/ipq9574-al01-c1.dts
+++ b/arch/arm/dts/ipq9574-al01-c1.dts
@@ -22,6 +22,7 @@
 		uart2 = "/serial@78B2000";
 		usb0 = "/xhci@8a00000";
 		nand = "/nand-controller@79B0000";
+		i2c0 = "/i2c@78B8000";
 	};
 
 	console: serial@78B1000 {
diff --git a/arch/arm/dts/ipq9574-al02-c1.dts b/arch/arm/dts/ipq9574-al02-c1.dts
index 3c3b880f98..b22df86270 100644
--- a/arch/arm/dts/ipq9574-al02-c1.dts
+++ b/arch/arm/dts/ipq9574-al02-c1.dts
@@ -22,7 +22,7 @@
 		uart2 = "/serial@78B2000";
 		usb0 = "/xhci@8a00000";
 		nand = "/nand-controller@79B0000";
-		i2c0 = "/i2c@78BA000";
+		i2c0 = "/i2c@78B8000";
 	};
 
 	console: serial@78B1000 {
@@ -124,26 +124,6 @@
 		};
 	};
 
-	i2c0: i2c@78BA000 {
-		i2c_gpio {
-			gpio1 {
-				gpio = <48>;
-				func = <1>;
-				pull = <GPIO_PULL_UP>;
-				drvstr = <GPIO_8MA>;
-				oe = <GPIO_OE_ENABLE>;
-			};
-
-			gpio2 {
-				gpio = <49>;
-				func = <1>;
-				pull = <GPIO_PULL_UP>;
-				drvstr = <GPIO_8MA>;
-				oe = <GPIO_OE_ENABLE>;
-			};
-		};
-	};
-
 	pci0: pci@20000000 {
 		status = "ok";
 		perst_gpio = <29>;
diff --git a/arch/arm/dts/ipq9574-db-al01-c1.dts b/arch/arm/dts/ipq9574-db-al01-c1.dts
index 438aadcb0d..fdb0227b9b 100644
--- a/arch/arm/dts/ipq9574-db-al01-c1.dts
+++ b/arch/arm/dts/ipq9574-db-al01-c1.dts
@@ -22,7 +22,7 @@
 		uart2 = "/serial@78B2000";
 		usb0 = "/xhci@8a00000";
 		nand = "/nand-controller@79B0000";
-		i2c0 = "/i2c@78BA000";
+		i2c0 = "/i2c@78B8000";
 	};
 
 	console: serial@78B1000 {
diff --git a/arch/arm/dts/ipq9574-db-al02-c1.dts b/arch/arm/dts/ipq9574-db-al02-c1.dts
index bbee0239f2..12cf5fc011 100644
--- a/arch/arm/dts/ipq9574-db-al02-c1.dts
+++ b/arch/arm/dts/ipq9574-db-al02-c1.dts
@@ -26,7 +26,7 @@
 		pci3 = "/pci@10000000";
 		usb0 = "/xhci@8a00000";
 		nand = "/nand-controller@79B0000";
-		i2c0 = "/i2c@78BA000";
+		i2c0 = "/i2c@78B8000";
 	};
 
 	console: serial@78B1000 {
diff --git a/arch/arm/dts/ipq9574-soc.dtsi b/arch/arm/dts/ipq9574-soc.dtsi
index 6203b67b50..f5d4b25a4f 100644
--- a/arch/arm/dts/ipq9574-soc.dtsi
+++ b/arch/arm/dts/ipq9574-soc.dtsi
@@ -93,12 +93,54 @@
 		};
 	};
 
-	i2c0: i2c@78BA000 {
+	i2c@78BA000 {
 		compatible = "qcom,qup-i2c";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		reg = <0x78BA000 0x600>;
-	        clock-frequency  = <400000>;
+		clock-frequency  = <400000>;
+		i2c_gpio {
+			gpio1 {
+				gpio = <48>;
+				func = <1>;
+				pull = <GPIO_PULL_UP>;
+				drvstr = <GPIO_8MA>;
+				oe = <GPIO_OE_ENABLE>;
+			};
+
+			gpio2 {
+				gpio = <49>;
+				func = <1>;
+				pull = <GPIO_PULL_UP>;
+				drvstr = <GPIO_8MA>;
+				oe = <GPIO_OE_ENABLE>;
+			};
+		};
+	};
+
+	i2c@78B8000 {
+		compatible = "qcom,qup-i2c";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x78B8000 0x600>;
+		clock-frequency  = <400000>;
+		i2c_gpio {
+			gpio1 {
+				gpio = <15>;
+				func = <2>;
+				pull = <GPIO_PULL_UP>;
+				drvstr = <GPIO_8MA>;
+				oe = <GPIO_OE_ENABLE>;
+			};
+
+			gpio2 {
+				gpio = <16>;
+				func = <2>;
+				pull = <GPIO_PULL_UP>;
+				drvstr = <GPIO_8MA>;
+				oe = <GPIO_OE_ENABLE>;
+			};
+		};
 	};
 
 	nand: nand-controller@79B0000 {