Skip to content

Commit

Permalink
stmmac: perform hw bus configuration
Browse files Browse the repository at this point in the history
On some platforms it can be required a different
configuration of the bus. This can be done
by invoking the bus_setup. It is defined
for all the platforms that needs this kind of
configuration.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Giuseppe CAVALLARO authored and David S. Miller committed Jan 8, 2010
1 parent ee7946a commit ca5f12c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/net/stmmac/gmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,6 @@ static void gmac_core_init(unsigned long ioaddr)
value |= GMAC_CORE_INIT;
writel(value, ioaddr + GMAC_CONTROL);

/* STBus Bridge Configuration */
/*writel(0xc5608, ioaddr + 0x00007000);*/

/* Freeze MMC counters */
writel(0x8, ioaddr + GMAC_MMC_CTRL);
/* Mask GMAC interrupts */
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,9 @@ static int stmmac_open(struct net_device *dev)

/* Copy the MAC addr into the HW */
priv->mac_type->ops->set_umac_addr(ioaddr, dev->dev_addr, 0);
/* If required, perform hw setup of the bus. */
if (priv->bus_setup)
priv->bus_setup(ioaddr);
/* Initialize the MAC Core */
priv->mac_type->ops->core_init(ioaddr);

Expand Down

0 comments on commit ca5f12c

Please sign in to comment.