GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: gem: Remove phydev variable

Browse source 
Resort code to use priv->phydev variable directly.
It will simplify move to DM.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2015-11-30 13:44:49 +01:00
parent f2fc27684f
commit 64a7ead64b
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/net/zynq_gem.c
View file

@ -315,7 +315,6 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis)
u32 i; u32 i;
int ret; int ret;
unsigned long clk_rate = 0; unsigned long clk_rate = 0;
struct phy_device *phydev;
struct zynq_gem_regs *regs = (struct zynq_gem_regs *)dev->iobase; struct zynq_gem_regs *regs = (struct zynq_gem_regs *)dev->iobase;
struct zynq_gem_priv *priv = dev->priv; struct zynq_gem_priv *priv = dev->priv;
struct emac_bd *dummy_tx_bd = &priv->tx_bd[TX_FREE_DESC]; struct emac_bd *dummy_tx_bd = &priv->tx_bd[TX_FREE_DESC];
@ -394,23 +393,21 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis)
return ret; return ret;
} }
/* interface - look at tsec */ priv->phydev = phy_connect(priv->bus, priv->phyaddr, dev,
phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface);
priv->interface);
phydev->supported = supported | ADVERTISED_Pause | priv->phydev->supported = supported | ADVERTISED_Pause |
ADVERTISED_Asym_Pause; ADVERTISED_Asym_Pause;
phydev->advertising = phydev->supported; priv->phydev->advertising = priv->phydev->supported;
priv->phydev = phydev; phy_config(priv->phydev);
phy_config(phydev); phy_startup(priv->phydev);
phy_startup(phydev);
if (!phydev->link) { if (!priv->phydev->link) {
printf("%s: No link.\n", phydev->dev->name); printf("%s: No link.\n", priv->phydev->dev->name);
return -1; return -1;
} }
switch (phydev->speed) { switch (priv->phydev->speed) {
case SPEED_1000: case SPEED_1000:
writel(ZYNQ_GEM_NWCFG_INIT | ZYNQ_GEM_NWCFG_SPEED1000, writel(ZYNQ_GEM_NWCFG_INIT | ZYNQ_GEM_NWCFG_SPEED1000,
&regs->nwcfg); &regs->nwcfg);