summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-08-20 16:07:34 -0400
committerTom Rini <trini@ti.com>2014-08-20 16:07:34 -0400
commit67ee22b0681305ba1099c508eecade996abc1c65 (patch)
treea1da76fb52d70ed7d2335e1885ee88d8b71414b8 /drivers
parent801123fe50464156103774a6e6d068ee4352a10b (diff)
parentf38391793f1a5c62d1c72a647f15a88e7c22ef11 (diff)
downloadu-boot-imx-67ee22b0681305ba1099c508eecade996abc1c65.zip
u-boot-imx-67ee22b0681305ba1099c508eecade996abc1c65.tar.gz
u-boot-imx-67ee22b0681305ba1099c508eecade996abc1c65.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fm/t4240.c5
-rw-r--r--drivers/qe/qe.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c
index 1eacb22..ae5aca4 100644
--- a/drivers/net/fm/t4240.c
+++ b/drivers/net/fm/t4240.c
@@ -71,6 +71,11 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
(is_serdes_configured(XFI_FM1_MAC10))))
return PHY_INTERFACE_MODE_XGMII;
+ if ((port == FM1_DTSEC9 || port == FM1_DTSEC10) &&
+ ((is_serdes_configured(XFI_FM1_MAC9)) ||
+ (is_serdes_configured(XFI_FM1_MAC10))))
+ return PHY_INTERFACE_MODE_XGMII;
+
if ((port == FM2_10GEC1 || port == FM2_10GEC2) &&
((is_serdes_configured(XAUI_FM2_MAC9)) ||
(is_serdes_configured(XAUI_FM2_MAC10)) ||
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index be09a17..4358a91 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -333,7 +333,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
/* Check the magic */
if ((hdr->magic[0] != 'Q') || (hdr->magic[1] != 'E') ||
(hdr->magic[2] != 'F')) {
- printf("Not a microcode\n");
+ printf("QE microcode not found\n");
#ifdef CONFIG_DEEP_SLEEP
setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_QE_DISABLE);
#endif