From ea5c08a8b2d9ecc5355babb1575cb4b7ed272b01 Mon Sep 17 00:00:00 2001
From: Vandhiadevan Karunamoorthy <quic_vkarunam@quicinc.com>
Date: Thu, 10 Nov 2022 22:15:15 +0530
Subject: [PATCH] arm: dts: ipq5332: update DB RDP ethernet config

Change-Id: I922455c02251553d1b43349abfa47bd6a4639e79
Signed-off-by: Vandhiadevan Karunamoorthy <quic_vkarunam@quicinc.com>
---
 arch/arm/dts/ipq5332-db-mi01.1.dts | 14 ++++----
 arch/arm/dts/ipq5332-db-mi02.1.dts | 56 +++++-------------------------
 2 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/arch/arm/dts/ipq5332-db-mi01.1.dts b/arch/arm/dts/ipq5332-db-mi01.1.dts
index 7733e4bf24..c05cd7476e 100644
--- a/arch/arm/dts/ipq5332-db-mi01.1.dts
+++ b/arch/arm/dts/ipq5332-db-mi01.1.dts
@@ -131,20 +131,22 @@
 	ess-switch {
 		switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
 		switch_mac_mode1 = <PORT_WRAPPER_USXGMII>;
-		aquantia_gpio = <22>;
-		aquantia_gpio_cnt = <1>;
-		aquantia_port = <1 2>;
-		aquantia_port_cnt = <2>;
+		aquantia_gpio = <22 24>;
+		aquantia_gpio_cnt = <2>;
 		mdc_mdio_gpio = <27 28>;
 
 		port_phyinfo {
 			port@0 {
-				phy_address = <0>;
+				phy_address = <8>;
 				phy_type = <AQ_PHY_TYPE>;
+				uniphy_id = <0>;
+				uniphy_mode = <PORT_WRAPPER_USXGMII>;
 			};
 			port@1 {
-				phy_address = <1>;
+				phy_address = <0>;
 				phy_type = <AQ_PHY_TYPE>;
+				uniphy_id = <1>;
+				uniphy_mode = <PORT_WRAPPER_USXGMII>;
 			};
 		};
 	};
diff --git a/arch/arm/dts/ipq5332-db-mi02.1.dts b/arch/arm/dts/ipq5332-db-mi02.1.dts
index 72c227da17..9b5d38d7e5 100644
--- a/arch/arm/dts/ipq5332-db-mi02.1.dts
+++ b/arch/arm/dts/ipq5332-db-mi02.1.dts
@@ -129,60 +129,20 @@
 	};
 
 	ess-switch {
-		switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
-		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>;
+		switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
+		switch_mac_mode1 = <PORT_WRAPPER_10GBASE_R>;
 		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>;
-				phy_type = <QCA8084_PHY_TYPE>;
-			};
-		};
-
-		qca8084_swt_info {
-			switch_mac_mode0 = <PORT_WRAPPER_SGMII_PLUS>;
-			switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
-
-			port@0 {
-				phy_address = <0xff>;
-				phy_type = <UNUSED_PHY_TYPE>;
-				forced-speed = <2500>;
-				forced-duplex = <1>;
-			};
-			port@1 {
-				phy_address = <1>;
-				phy_type = <QCA8084_PHY_TYPE>;
-			};
-			port@2 {
-				phy_address = <2>;
-				phy_type = <QCA8084_PHY_TYPE>;
-			};
-			port@3 {
-				phy_address = <3>;
-				phy_type = <QCA8084_PHY_TYPE>;
-			};
-			port@4 {
-				phy_address = <0x4>;
-				phy_type = <QCA8084_PHY_TYPE>;
-			};
-			port@5 {
-				phy_address = <0xff>;
-				phy_type = <UNUSED_PHY_TYPE>;
-				forced-speed = <2500>;
-				forced-duplex = <1>;
+				phy_type = <SFP_PHY_TYPE>;
+				uniphy_id = <1>;
+				uniphy_mode = <PORT_WRAPPER_10GBASE_R>;
 			};
 		};
 	};