summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorShaohui Xie <Shaohui.Xie@freescale.com>2014-08-13 18:32:19 +0800
committerYork Sun <yorksun@freescale.com>2014-11-14 11:12:13 -0800
commitff5fb2a36dff8a92d6483359167a6b1525359eaf (patch)
tree5a8605ad1a59a7f21bb068add05e7f00b3e72e03 /arch
parenta5fbe7422edcbf83a58d03263c4eed0f06283dab (diff)
downloadblackbird-obmc-uboot-ff5fb2a36dff8a92d6483359167a6b1525359eaf.tar.gz
blackbird-obmc-uboot-ff5fb2a36dff8a92d6483359167a6b1525359eaf.zip
Fman/mEMAC: mEMAC fix for 10G MAC and PHY
1. use Payload length check disable when enable MAC; 2. add XGMII support for setting MAC interface mode; 3. only enable auto negotiation for Non-XGMII mode; 4. return 0xffff if clause 22 is used to read 10G phy_id; Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Acked-By: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/include/asm/fsl_memac.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/fsl_memac.h b/arch/powerpc/include/asm/fsl_memac.h
index 4640e33a5e..f84c1a915b 100644
--- a/arch/powerpc/include/asm/fsl_memac.h
+++ b/arch/powerpc/include/asm/fsl_memac.h
@@ -159,6 +159,7 @@ struct memac {
#define MEMAC_CMD_CFG_RX_EN 0x00000002 /* MAC Rx path enable */
#define MEMAC_CMD_CFG_TX_EN 0x00000001 /* MAC Tx path enable */
#define MEMAC_CMD_CFG_RXTX_EN (MEMAC_CMD_CFG_RX_EN | MEMAC_CMD_CFG_TX_EN)
+#define MEMAC_CMD_CFG_NO_LEN_CHK 0x20000 /* Payload length check disable */
/* HASHTABLE_CTRL - Hashtable control register */
#define HASHTABLE_CTRL_MCAST_EN 0x00000200 /* enable mulitcast Rx hash */
OpenPOWER on IntegriCloud