diff mbox

[U-Boot,v3,04/11] net/fm: Enable FMAN ports if l2switch ports are connected over SGMII

Message ID 1421064519-6248-5-git-send-email-codrin.ciubotariu@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Codrin Ciubotariu Jan. 12, 2015, 12:08 p.m. UTC
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 <codrin.ciubotariu@freescale.com>
---

Changes for v2: None

Changes for v3: Removed "Change-id" line from comment;

 drivers/net/fm/t1040.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

York Sun Jan. 23, 2015, 12:39 a.m. UTC | #1
On 01/12/2015 06:08 AM, Codrin Ciubotariu wrote:
> 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 <codrin.ciubotariu@freescale.com>
> ---
> 
> Changes for v2: None
> 
> Changes for v3: Removed "Change-id" line from comment;
> 

Applied to u-boot-mpc85xx master branch, awaiting upstream.

York
diff mbox

Patch

diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
index d2a097e..0458366 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: