GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-23 07:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: gem: Enable MDIO bus earlier

Browse source 
Enable access to MDIO before zynq_gem_init is called.
It enables read information about phy earlier.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2015-11-30 13:58:36 +01:00
parent 90c6f2e21b
commit c8e29271b1
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/zynq_gem.c
View file

@ -314,6 +314,7 @@ static int zynq_phy_init(struct eth_device *dev)
{ {
int ret; int ret;
struct zynq_gem_priv *priv = dev->priv; struct zynq_gem_priv *priv = dev->priv;
struct zynq_gem_regs *regs = (struct zynq_gem_regs *)dev->iobase;
const u32 supported = SUPPORTED_10baseT_Half | const u32 supported = SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full | SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Half |
@ -321,6 +322,9 @@ static int zynq_phy_init(struct eth_device *dev)
SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Half |
SUPPORTED_1000baseT_Full; SUPPORTED_1000baseT_Full;
/* Enable only MDIO bus */
writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, &regs->nwctrl);
ret = phy_detection(dev); ret = phy_detection(dev);
if (ret) { if (ret) {
printf("GEM PHY init failed\n"); printf("GEM PHY init failed\n");
@ -343,7 +347,6 @@ static int zynq_phy_init(struct eth_device *dev)
static int zynq_gem_init(struct eth_device *dev, bd_t *bis) static int zynq_gem_init(struct eth_device *dev, bd_t *bis)
{ {
u32 i; u32 i;
int ret;
unsigned long clk_rate = 0; unsigned long clk_rate = 0;
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;
@ -411,10 +414,6 @@ static int zynq_gem_init(struct eth_device *dev, bd_t *bis)
priv->init++; priv->init++;
} }
ret = zynq_phy_init(dev);
if (ret)
return ret;
phy_startup(priv->phydev); phy_startup(priv->phydev);
if (!priv->phydev->link) { if (!priv->phydev->link) {
@ -597,6 +596,7 @@ static int zynq_gem_miiphy_write(const char *devname, uchar addr,
int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr, int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr,
int phy_addr, u32 emio) int phy_addr, u32 emio)
{ {
int ret;
struct eth_device *dev; struct eth_device *dev;
struct zynq_gem_priv *priv; struct zynq_gem_priv *priv;
void *bd_space; void *bd_space;
@ -650,6 +650,10 @@ int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr,
miiphy_register(dev->name, zynq_gem_miiphyread, zynq_gem_miiphy_write); miiphy_register(dev->name, zynq_gem_miiphyread, zynq_gem_miiphy_write);
priv->bus = miiphy_get_dev_by_name(dev->name); priv->bus = miiphy_get_dev_by_name(dev->name);
ret = zynq_phy_init(dev);
if (ret)
return ret;
return 1; return 1;
} }