From: Codrin Ciubotariu Date: Mon, 12 Jan 2015 12:08:32 +0000 (+0200) Subject: net/fm: Enable FMAN ports if l2switch ports are connected over SGMII X-Git-Tag: v2015.04-rc1~61^2~7 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=27b57569549251f65d37fe95593997004f0f69b8;p=oweals%2Fu-boot.git net/fm: Enable FMAN ports if l2switch ports are connected over SGMII If SerDes is configured to connect L2 Switch ports from T1040 over SGMII or QSGMII, the two FMAN fixed ports (FM1@DTSEC1 and FM2@DTSEC2) that are connected to two L2 swtch ports must be enabled. These ports don't have PHYs and must be treated accordingly. Signed-off-by: Codrin Ciubotariu Reviewed-by: York Sun --- diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c index d2a097e0e5..04583661ec 100644 --- a/drivers/net/fm/t1040.c +++ b/drivers/net/fm/t1040.c @@ -50,7 +50,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port) switch (port) { case FM1_DTSEC1: case FM1_DTSEC2: - if (is_serdes_configured(QSGMII_SW1_A + port - FM1_DTSEC1)) + if (is_serdes_configured(QSGMII_SW1_A + port - FM1_DTSEC1) || + is_serdes_configured(SGMII_SW1_MAC1 + port - FM1_DTSEC1)) return PHY_INTERFACE_MODE_QSGMII; case FM1_DTSEC3: case FM1_DTSEC4: