[U-Boot] [PATCH 2/3] fec: add the i.mx6q enet driver support

2011-12-13 Thread Jason Liu
Cc: Stefano Babic 
Signed-off-by: Jason Liu 
---
 drivers/net/fec_mxc.c |   10 ++
 drivers/net/fec_mxc.h |7 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index b05a4c0..3affda8 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -384,6 +384,14 @@ static int fec_open(struct eth_device *edev)
writel(1 << 2, &fec->eth->x_cntrl);
fec->rbd_index = 0;
 
+#if defined(CONFIG_MX6Q)
+   /* Enable ENET HW endian SWAP */
+   writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_DBSWAP,
+   &fec->eth->ecntrl);
+   /* Enable ENET store and forward mode */
+   writel(readl(&fec->eth->x_wmrk) | FEC_X_WMRK_STRFWD,
+   &fec->eth->x_wmrk);
+#endif
/*
 * Enable FEC-Lite controller
 */
@@ -485,6 +493,8 @@ static int fec_init(struct eth_device *dev, bd_t* bd)
rcntrl = PKTSIZE << FEC_RCNTRL_MAX_FL_SHIFT;
if (fec->xcv_type == SEVENWIRE)
rcntrl |= FEC_RCNTRL_FCE;
+   else if (fec->xcv_type == RGMII)
+   rcntrl |= FEC_RCNTRL_RGMII;
else if (fec->xcv_type == RMII)
rcntrl |= FEC_RCNTRL_RMII;
else/* MII mode */
diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 8b26645..39337bf 100644
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -196,6 +196,7 @@ struct ethernet_regs {
 #define FEC_RCNTRL_PROM0x0008
 #define FEC_RCNTRL_BC_REJ  0x0010
 #define FEC_RCNTRL_FCE 0x0020
+#define FEC_RCNTRL_RGMII   0x0040
 #define FEC_RCNTRL_RMII0x0100
 
 #define FEC_TCNTRL_GTS 0x0001
@@ -206,6 +207,9 @@ struct ethernet_regs {
 
 #define FEC_ECNTRL_RESET   0x0001  /* reset the FEC */
 #define FEC_ECNTRL_ETHER_EN0x0002  /* enable the FEC */
+#define FEC_ECNTRL_DBSWAP  0x0100
+
+#define FEC_X_WMRK_STRFWD  0x0100
 
 #if defined(CONFIG_MX25) || defined(CONFIG_MX53)
 /* defines for MIIGSK */
@@ -261,7 +265,8 @@ enum xceiver_type {
SEVENWIRE,  /* 7-wire   */
MII10,  /* MII 10Mbps   */
MII100, /* MII 100Mbps  */
-   RMII/* RMII */
+   RMII,   /* RMII */
+   RGMII,  /* RGMII */
 };
 
 /**
-- 
1.7.4.1


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH 2/3] fec: add the i.mx6q enet driver support

2011-12-16 Thread Stefano Babic
On 13/12/2011 14:44, Jason Liu wrote:
> Cc: Stefano Babic 
> Signed-off-by: Jason Liu 
> ---
>  drivers/net/fec_mxc.c |   10 ++
>  drivers/net/fec_mxc.h |7 ++-
>  2 files changed, 16 insertions(+), 1 deletions(-)
> 

Acked-by : Stefano Babic 

Best regards,
Stefano Babic

-- 
=
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: off...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot