summaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac
diff options
context:
space:
mode:
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>2010-01-06 23:07:15 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-07 17:06:07 -0800
commitca5f12c1a82cf72ce73617dfc8ef56faf6fec30a (patch)
tree6a449b00f64e78b5b04bf2eaebc93759b0bc0f9d /drivers/net/stmmac
parentee7946a77858f417227cf57cd647729d0dd75761 (diff)
downloadop-kernel-dev-ca5f12c1a82cf72ce73617dfc8ef56faf6fec30a.zip
op-kernel-dev-ca5f12c1a82cf72ce73617dfc8ef56faf6fec30a.tar.gz
stmmac: perform hw bus configuration
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>
Diffstat (limited to 'drivers/net/stmmac')
-rw-r--r--drivers/net/stmmac/gmac.c3
-rw-r--r--drivers/net/stmmac/stmmac_main.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/stmmac/gmac.c b/drivers/net/stmmac/gmac.c
index 9828756..c127887 100644
--- a/drivers/net/stmmac/gmac.c
+++ b/drivers/net/stmmac/gmac.c
@@ -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 */
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index d50fe6f..a02006d 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -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);
OpenPOWER on IntegriCloud