V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

net: axi_emac: Pass directly pointer to register space 

Simplify mdio_wait function by passing regs directly.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Michal Simek 2015-12-09 14:36:31 +01:00
parent 2652a6219f
commit f36bbcceba
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/xilinx_axi_emac.c
View File

@ -147,9 +147,8 @@ struct axi_regs {
*/ */
#define PHY_DETECT_MASK 0x1808 #define PHY_DETECT_MASK 0x1808
static inline int mdio_wait(struct eth_device *dev) static inline int mdio_wait(struct axi_regs *regs)
{ {
struct axi_regs *regs = (struct axi_regs *)dev->iobase;
u32 timeout = 200; u32 timeout = 200;
/* Wait till MDIO interface is ready to accept a new transaction. */ /* Wait till MDIO interface is ready to accept a new transaction. */
@ -171,7 +170,7 @@ static u32 phyread(struct eth_device *dev, u32 phyaddress, u32 registernum,
struct axi_regs *regs = (struct axi_regs *)dev->iobase; struct axi_regs *regs = (struct axi_regs *)dev->iobase;
u32 mdioctrlreg = 0; u32 mdioctrlreg = 0;
if (mdio_wait(dev)) if (mdio_wait(regs))
return 1; return 1;
mdioctrlreg = ((phyaddress << XAE_MDIO_MCR_PHYAD_SHIFT) & mdioctrlreg = ((phyaddress << XAE_MDIO_MCR_PHYAD_SHIFT) &
@ -183,7 +182,7 @@ static u32 phyread(struct eth_device *dev, u32 phyaddress, u32 registernum,
out_be32(&regs->mdio_mcr, mdioctrlreg); out_be32(&regs->mdio_mcr, mdioctrlreg);
if (mdio_wait(dev)) if (mdio_wait(regs))
return 1; return 1;
/* Read data */ /* Read data */
@ -197,7 +196,7 @@ static u32 phywrite(struct eth_device *dev, u32 phyaddress, u32 registernum,
struct axi_regs *regs = (struct axi_regs *)dev->iobase; struct axi_regs *regs = (struct axi_regs *)dev->iobase;
u32 mdioctrlreg = 0; u32 mdioctrlreg = 0;
if (mdio_wait(dev)) if (mdio_wait(regs))
return 1; return 1;
mdioctrlreg = ((phyaddress << XAE_MDIO_MCR_PHYAD_SHIFT) & mdioctrlreg = ((phyaddress << XAE_MDIO_MCR_PHYAD_SHIFT) &
@ -212,7 +211,7 @@ static u32 phywrite(struct eth_device *dev, u32 phyaddress, u32 registernum,
out_be32(&regs->mdio_mcr, mdioctrlreg); out_be32(&regs->mdio_mcr, mdioctrlreg);
if (mdio_wait(dev)) if (mdio_wait(regs))
return 1; return 1;
return 0; return 0;