diff options
| author | Hubert Feurstein <h.feurstein@gmail.com> | 2013-02-07 11:06:06 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-11 20:56:19 +0100 |
| commit | 91afe6c2221609ddf5f66dd01f0ed3e1d3dac5ae (patch) | |
| tree | 3ccb9502d4c2426af90534e5fb0051aad7119462 /drivers | |
| parent | 3fa377ae66f61c24335e26ba22321624a5aad303 (diff) | |
| download | barebox-91afe6c2221609ddf5f66dd01f0ed3e1d3dac5ae.tar.gz barebox-91afe6c2221609ddf5f66dd01f0ed3e1d3dac5ae.tar.xz | |
net fec_imx: add support for i.MX6 1000Mbps mode
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fec_imx.c | 14 | ||||
| -rw-r--r-- | drivers/net/fec_imx.h | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 2378a19366..7320f073d0 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -361,12 +361,18 @@ static int fec_init(struct eth_device *dev) static void fec_update_linkspeed(struct eth_device *edev) { struct fec_priv *fec = (struct fec_priv *)edev->priv; + int speed = edev->phydev->speed; + u32 rcntl = readl(fec->regs + FEC_R_CNTRL) & ~FEC_R_CNTRL_RMII_10T; + u32 ecntl = readl(fec->regs + FEC_ECNTRL) & ~FEC_ECNTRL_SPEED; - if (edev->phydev->speed == SPEED_10) { - u32 rcntl = readl(fec->regs + FEC_R_CNTRL); + if (speed == SPEED_10) rcntl |= FEC_R_CNTRL_RMII_10T; - writel(rcntl, fec->regs + FEC_R_CNTRL); - } + + if (speed == SPEED_1000) + ecntl |= FEC_ECNTRL_SPEED; + + writel(rcntl, fec->regs + FEC_R_CNTRL); + writel(ecntl, fec->regs + FEC_ECNTRL); } /** diff --git a/drivers/net/fec_imx.h b/drivers/net/fec_imx.h index 1eb1eba5a1..29aea852df 100644 --- a/drivers/net/fec_imx.h +++ b/drivers/net/fec_imx.h @@ -92,6 +92,7 @@ #define FEC_ECNTRL_RESET 0x00000001 /**< reset the FEC */ #define FEC_ECNTRL_ETHER_EN 0x00000002 /**< enable the FEC */ +#define FEC_ECNTRL_SPEED 0x00000020 /**< i.MX6: enable 1000Mbps mode */ /** * @brief Descriptor buffer alignment |