Skip to contentSkip to conversation

powerpc/t2080qds: some update for t2080qds

PATCH New Shengzhou Liu 2 participants 2 messages Jan 3, 2014 – Jan 21, 2014 Network drivers

lore
Share & tools
lore

Shengzhou Liu

author
#0 lore raw

PATCH v2 1/1 powerpc/t2080qds: some update for t2080qds

- add more serdes protocols support.
- fix some serdes lanes route.
- fix SGMII doesn't work and incorrect mdio display for XFI when serdes 0x6d.
- correct boot location info for SD/SPI boot.

Signed-off-by Shengzhou Liu <[email protected]>

---
v2: update to support more serdes, applied in Gerrit sdk.

 board/freescale/t2080qds/eth_t2080qds.c | 12 ++++--
 board/freescale/t2080qds/t2080qds.c     | 66 ++++++++++++++++++++++++++++++---
 drivers/net/fm/t2080.c                  | 10 +++--
 3 files changed, 75 insertions(+), 13 deletions(-)
board/freescale/t2080qds/eth_t2080qds.c +9 -3
index 9a909db..68d74c3 100644
@@ -372,9 +372,11 @@ int board_eth_init(bd_t *bis)
 		break;
 	case 0x6c:
 	case 0x6d:
+		fm_info_set_phy_address(FM1_10GEC1, 4);
+		fm_info_set_phy_address(FM1_10GEC2, 5);
 		/* SGMII in Slot3 */
 		fm_info_set_phy_address(FM1_DTSEC1, SGMII_CARD_PORT3_PHY_ADDR);
-		fm_info_set_phy_address(FM1_DTSEC2, SGMII_CARD_PORT2_PHY_ADDR);
+		fm_info_set_phy_address(FM1_DTSEC2, SGMII_CARD_PORT4_PHY_ADDR);
 		break;
 	case 0x71:
 		/* SGMII in Slot3 */

@@ -419,7 +421,6 @@ int board_eth_init(bd_t *bis)
 		fm_info_set_phy_address(FM1_DTSEC6, SGMII_CARD_PORT2_PHY_ADDR);
 		break;
 	default:
-		puts("Invalid SerDes1 protocol for T2080QDS\n");
 		break;
 	}
 

@@ -449,7 +450,12 @@ int board_eth_init(bd_t *bis)
 				fm_info_set_mdio(i, mii_dev_for_muxval(
 						 mdio_mux[i]));
 				break;
-			};
+			case 3:
+				mdio_mux[i] = EMI1_SLOT3;
+				fm_info_set_mdio(i, mii_dev_for_muxval(
+						mdio_mux[i]));
+				break;
+			}
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
 			if (i == FM1_DTSEC3)
board/freescale/t2080qds/t2080qds.c +60 -6

112 lines not on this page · raw message

drivers/net/fm/t2080.c +6 -4
index b5c1e9f..3b6212f 100644
@@ -50,15 +50,17 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
 	if (is_device_disabled(port))
 		return PHY_INTERFACE_MODE_NONE;
 
-	if ((port == FM1_10GEC1 || port == FM1_10GEC2 ||
-	     port == FM1_10GEC3 || port == FM1_10GEC4) &&
+	if ((port == FM1_10GEC1 || port == FM1_10GEC2) &&
 	    ((is_serdes_configured(XAUI_FM1_MAC9))	||
-	     (is_serdes_configured(XFI_FM1_MAC1))	||
-	     (is_serdes_configured(XFI_FM1_MAC2))	||
 	     (is_serdes_configured(XFI_FM1_MAC9))	||
 	     (is_serdes_configured(XFI_FM1_MAC10))))
 		return PHY_INTERFACE_MODE_XGMII;
 
+	if ((port == FM1_10GEC3 || port == FM1_10GEC4) &&
+	    ((is_serdes_configured(XFI_FM1_MAC1))	||
+	     (is_serdes_configured(XFI_FM1_MAC2))))
+		return PHY_INTERFACE_MODE_XGMII;
+
 	if ((port == FM1_DTSEC3) && ((rcwsr13 & FSL_CORENET_RCWSR13_EC1) ==
 		FSL_CORENET_RCWSR13_EC1_DTSEC3_RGMII))
 		return PHY_INTERFACE_MODE_RGMII;
Signature · 1 line
1.8.0
#1 lore raw

PATCH v2 1/1 powerpc/t2080qds: some update for t2080qds

Quoted 9 lines · Shengzhou Liu

- add more serdes protocols support.
- fix some serdes lanes route.
- fix SGMII doesn't work and incorrect mdio display for XFI when serdes 0x6d.
- correct boot location info for SD/SPI boot.

Signed-off-by Shengzhou Liu <[email protected]>

---
v2: update to support more serdes, applied in Gerrit sdk.

Applied to u-boot-mpc85xx master branch. Awaiting upstream.

York