diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-04-11 07:18:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 16:06:24 -0400 |
| commit | 31171aec23206e00ca4458cc3e3357a5275ccaaa (patch) | |
| tree | 1ae0760ca2052863cf25655dfd2a6ed44e32fcc6 | |
| parent | 940ff7ed0e2af6410078addead6ca245f55b72da (diff) | |
| download | linux-3.10-31171aec23206e00ca4458cc3e3357a5275ccaaa.tar.gz linux-3.10-31171aec23206e00ca4458cc3e3357a5275ccaaa.tar.bz2 linux-3.10-31171aec23206e00ca4458cc3e3357a5275ccaaa.zip | |
r6040: define and use bits of register PHY_CC
Define and use the bits of the PHY_CC (status change configuration) register.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index afa4186cb2b..050cf5982ae 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c @@ -128,6 +128,9 @@ #define MID_3M 0x82 /* MID3 Medium */ #define MID_3H 0x84 /* MID3 High */ #define PHY_CC 0x88 /* PHY status change configuration register */ +#define SCEN 0x8000 /* PHY status change enable */ +#define PHYAD_SHIFT 8 /* PHY address shift */ +#define TMRDIV_SHIFT 0 /* Timer divider shift */ #define PHY_ST 0x8A /* PHY status register */ #define MAC_SM 0xAC /* MAC status machine */ #define MAC_SM_RST 0x0002 /* MAC status machine reset */ @@ -1132,10 +1135,15 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, err = -EIO; goto err_out_free_res; } + /* If PHY status change register is still set to zero it means the - * bootloader didn't initialize it */ + * bootloader didn't initialize it, so we set it to: + * - enable phy status change + * - enable all phy addresses + * - set to lowest timer divider */ if (ioread16(ioaddr + PHY_CC) == 0) - iowrite16(0x9f07, ioaddr + PHY_CC); + iowrite16(SCEN | PHY_MAX_ADDR << PHYAD_SHIFT | + 7 << TMRDIV_SHIFT, ioaddr + PHY_CC); /* Init system & device */ lp->base = ioaddr; |