diff options
| author | Tom Rini <trini@ti.com> | 2015-01-22 20:04:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-22 20:04:17 -0500 |
| commit | ec0cc98f2cb7fa217ed0a1a54978e2d8f2fbc20c (patch) | |
| tree | 6bfa9a96dcad59fc12f8825cfaf99c09680075f5 /drivers/net/fm/t1040.c | |
| parent | 032c6867a2925c95897afe07d1f0678114254cf6 (diff) | |
| parent | db4a1767c09a4696792204d1cac33631cb38424e (diff) | |
| download | u-boot-imx-ec0cc98f2cb7fa217ed0a1a54978e2d8f2fbc20c.zip u-boot-imx-ec0cc98f2cb7fa217ed0a1a54978e2d8f2fbc20c.tar.gz u-boot-imx-ec0cc98f2cb7fa217ed0a1a54978e2d8f2fbc20c.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/net/fm/t1040.c')
| -rw-r--r-- | drivers/net/fm/t1040.c | 3 |
1 files changed, 2 insertions, 1 deletions
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: |