diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-01-24 14:53:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-25 18:10:26 +0100 |
| commit | 6b145cd3b35820d5336d27dec1cad1fb146d7d24 (patch) | |
| tree | a385e6b005a9f1b2b3f47f95f8e3abbe9f7a77d6 /drivers/net | |
| parent | eeabfc4ab5c3fc2b6cf6b2bff02006b2f9c17f3d (diff) | |
| download | barebox-6b145cd3b35820d5336d27dec1cad1fb146d7d24.tar.gz barebox-6b145cd3b35820d5336d27dec1cad1fb146d7d24.tar.xz | |
net: fec_imx: refactor R_CNTRL setup
Introduce a variable which gets updated when needed and only written
once. Will make further additions easier.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_imx.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 1101dadb3e..15c7a4a480 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -274,6 +274,7 @@ static int fec_set_hwaddr(struct eth_device *dev, unsigned char *mac) static int fec_init(struct eth_device *dev) { struct fec_priv *fec = (struct fec_priv *)dev->priv; + u32 rcntl; /* * Clear FEC-Lite interrupt event register(IEVENT) @@ -288,17 +289,9 @@ static int fec_init(struct eth_device *dev) /* * Set FEC-Lite receive control register(R_CNTRL): */ - if (fec->xcv_type == SEVENWIRE) { - /* - * Frame length=1518; 7-wire mode - */ - writel(FEC_R_CNTRL_MAX_FL(1518), fec->regs + FEC_R_CNTRL); - } else { - /* - * Frame length=1518; MII mode; - */ - writel(FEC_R_CNTRL_MAX_FL(1518) | FEC_R_CNTRL_MII_MODE, - fec->regs + FEC_R_CNTRL); + rcntl = FEC_R_CNTRL_MAX_FL(1518); + if (fec->xcv_type != SEVENWIRE) { + rcntl |= FEC_R_CNTRL_MII_MODE; /* * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock * and do not drop the Preamble. @@ -309,13 +302,10 @@ static int fec_init(struct eth_device *dev) if (fec->xcv_type == RMII) { if (cpu_is_mx28()) { - /* just another way to enable RMII */ - uint32_t reg = readl(fec->regs + FEC_R_CNTRL); - writel(reg | FEC_R_CNTRL_RMII_MODE + rcntl |= FEC_R_CNTRL_RMII_MODE; /* the linux driver add these bits, why not we? */ /* | FEC_R_CNTRL_FCE | */ - /* FEC_R_CNTRL_NO_LGTH_CHECK */, - fec->regs + FEC_R_CNTRL); + /* FEC_R_CNTRL_NO_LGTH_CHECK */ } else { /* disable the gasket and wait */ writel(0, fec->regs + FEC_MIIGSK_ENR); @@ -329,6 +319,7 @@ static int fec_init(struct eth_device *dev) writel(FEC_MIIGSK_ENR_EN, fec->regs + FEC_MIIGSK_ENR); } } + writel(rcntl, fec->regs + FEC_R_CNTRL); /* * Set Opcode/Pause Duration Register |