From 9ec1f908bc5ac03aee05f7aee1a8d21351dc9708 Mon Sep 17 00:00:00 2001
From: Vandhiadevan Karunamoorthy <quic_vkarunam@quicinc.com>
Date: Wed, 19 Oct 2022 07:19:54 +0530
Subject: [PATCH] arm: dts: ipq5332: update ethernet config

Change-Id: Id790f4f97d865bc73b97f2ab5069cada4148cf04
Signed-off-by: Vandhiadevan Karunamoorthy <quic_vkarunam@quicinc.com>
---
 arch/arm/dts/ipq5332-mi01.1.dts | 17 ++++++++---------
 arch/arm/dts/ipq5332-mi01.2.dts | 14 ++++++--------
 arch/arm/dts/ipq5332-mi01.4.dts | 16 ++++++++--------
 arch/arm/dts/ipq5332-mi01.6.dts | 19 +++++++++++++++++++
 arch/arm/dts/ipq5332-mi01.7.dts | 19 +++++++++++++++++++
 5 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/arch/arm/dts/ipq5332-mi01.1.dts b/arch/arm/dts/ipq5332-mi01.1.dts
index c5352c39ec..97cc91da17 100644
--- a/arch/arm/dts/ipq5332-mi01.1.dts
+++ b/arch/arm/dts/ipq5332-mi01.1.dts
@@ -147,26 +147,25 @@
 	};
 
 	ess-switch {
-		switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
+		switch_mac_mode0 = <PORT_WRAPPER_SGMII_PLUS>;
 		switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
-		aquantia_gpio = <22>;
-		aquantia_gpio_cnt = <1>;
-		aquantia_port = <1>;
-		aquantia_port_cnt = <1>;
 		qca808x_gpio = <16>;
 		qca808x_gpio_cnt = <1>;
 		mdc_mdio_gpio = <27 28>;
-
+		napa_gpio = <22>;
 		qca8084_switch_enable = <1>;
-
 		port_phyinfo {
 			port@0 {
-				phy_address = <0>;
-				phy_type = <AQ_PHY_TYPE>;
+				phy_address = <28>;
+				phy_type = <QCA8081_PHY_TYPE>;
+				uniphy_id = <0>;
+				uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
 			};
 			port@1 {
 				phy_address = <1>;
 				phy_type = <QCA8084_PHY_TYPE>;
+				uniphy_id = <1>;
+				uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
 			};
 		};
 
diff --git a/arch/arm/dts/ipq5332-mi01.2.dts b/arch/arm/dts/ipq5332-mi01.2.dts
index 58b8a66c55..4e64b7b1d0 100644
--- a/arch/arm/dts/ipq5332-mi01.2.dts
+++ b/arch/arm/dts/ipq5332-mi01.2.dts
@@ -159,26 +159,24 @@
 	};
 
 	ess-switch {
-		switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
+		switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
 		switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
-		aquantia_gpio = <22>;
-		aquantia_gpio_cnt = <1>;
-		aquantia_port = <1>;
-		aquantia_port_cnt = <1>;
 		qca808x_gpio = <16>;
 		qca808x_gpio_cnt = <1>;
 		mdc_mdio_gpio = <27 28>;
-
 		qca8084_switch_enable = <1>;
 
 		port_phyinfo {
 			port@0 {
-				phy_address = <0>;
-				phy_type = <AQ_PHY_TYPE>;
+				phy_type = <SFP_PHY_TYPE>;
+				uniphy_id = <0>;
+				uniphy_mode = <PORT_WRAPPER_10GBASE_R>;
 			};
 			port@1 {
 				phy_address = <1>;
+				uniphy_id = <1>;
 				phy_type = <QCA8084_PHY_TYPE>;
+				uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
 			};
 		};
 
diff --git a/arch/arm/dts/ipq5332-mi01.4.dts b/arch/arm/dts/ipq5332-mi01.4.dts
index 9114c082c6..3a2494240f 100644
--- a/arch/arm/dts/ipq5332-mi01.4.dts
+++ b/arch/arm/dts/ipq5332-mi01.4.dts
@@ -144,26 +144,26 @@
 	};
 
 	ess-switch {
-		switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
+		switch_mac_mode0 = <PORT_WRAPPER_SGMII_PLUS>;
 		switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
-		aquantia_gpio = <22>;
-		aquantia_gpio_cnt = <1>;
-		aquantia_port = <1>;
-		aquantia_port_cnt = <1>;
 		qca808x_gpio = <16>;
 		qca808x_gpio_cnt = <1>;
 		mdc_mdio_gpio = <27 28>;
-
+		napa_gpio = <22>;
 		qca8084_switch_enable = <1>;
 
 		port_phyinfo {
 			port@0 {
-				phy_address = <0>;
-				phy_type = <AQ_PHY_TYPE>;
+				phy_address = <28>;
+				phy_type = <QCA8081_PHY_TYPE>;
+				uniphy_id = <0>;
+				uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
 			};
 			port@1 {
 				phy_address = <1>;
 				phy_type = <QCA8084_PHY_TYPE>;
+				uniphy_id = <1>;
+				uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
 			};
 		};
 
diff --git a/arch/arm/dts/ipq5332-mi01.6.dts b/arch/arm/dts/ipq5332-mi01.6.dts
index e240de6906..241d59b7c9 100644
--- a/arch/arm/dts/ipq5332-mi01.6.dts
+++ b/arch/arm/dts/ipq5332-mi01.6.dts
@@ -18,4 +18,23 @@
 / {
 	machid = <0x8060006>;
 	config_name = "config@mi01.6";
+
+	ess-switch {
+		switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
+		switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
+		qca808x_gpio = <16>;
+		qca808x_gpio_cnt = <1>;
+		mdc_mdio_gpio = <27 28>;
+		qca8084_switch_enable = <1>;
+		/delete-property/napa_gpio;
+
+		port_phyinfo {
+			port@0 {
+				/delete-property/phy_address;
+				phy_type = <SFP_PHY_TYPE>;
+				uniphy_id = <0>;
+				uniphy_mode = <PORT_WRAPPER_10GBASE_R>;
+			};
+		};
+	};
 };
diff --git a/arch/arm/dts/ipq5332-mi01.7.dts b/arch/arm/dts/ipq5332-mi01.7.dts
index e7d68ae27e..1f7b1018a4 100644
--- a/arch/arm/dts/ipq5332-mi01.7.dts
+++ b/arch/arm/dts/ipq5332-mi01.7.dts
@@ -18,4 +18,23 @@
 / {
 	machid = <0x8060007>;
 	config_name = "config@mi01.7";
+
+	ess-switch {
+		switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
+		switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
+		qca808x_gpio = <16>;
+		qca808x_gpio_cnt = <1>;
+		mdc_mdio_gpio = <27 28>;
+		qca8084_switch_enable = <1>;
+		/delete-property/napa_gpio;
+
+		port_phyinfo {
+			port@0 {
+				/delete-property/phy_address;
+				phy_type = <SFP_PHY_TYPE>;
+				uniphy_id = <0>;
+				uniphy_mode = <PORT_WRAPPER_10GBASE_R>;
+			};
+		};
+	};
 };