Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5f12c1 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

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: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee7946a7

drivers/net/stmmac/gmac.c

+0 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/net/stmmac/stmmac_main.c

+3 −0
Original line number Diff line number Diff line
@@ -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);