summaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-11-16 18:19:53 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-19 10:19:08 +0100
commitc81154671253d730ad159db136235bfe2111d2db (patch)
treedff453fbc34a6ea4198c24e4ff32235299d97770 /drivers/net/macb.c
parentd1662f9db3d3ba743bd73c72cca86f71f86c2ad4 (diff)
downloadbarebox-c81154671253d730ad159db136235bfe2111d2db.tar.gz
barebox-c81154671253d730ad159db136235bfe2111d2db.tar.xz
macb/ether: split flags for drivers and phylib
as in the kernel use is_rmii flags for pinctrl phy_flags for phylib flags Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r--drivers/net/macb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index ce3ef660f3..35e5e58c49 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -439,13 +439,12 @@ static int macb_probe(struct device_d *dev)
macb->miibus.priv = macb;
macb->miibus.parent = dev;
- if (pdata->flags & AT91SAM_ETHER_RMII)
+ if (pdata->is_rmii)
macb->interface = PHY_INTERFACE_MODE_RMII;
else
macb->interface = PHY_INTERFACE_MODE_MII;
- macb->phy_flags = pdata->flags & AT91SAM_ETHER_FORCE_LINK ?
- PHYLIB_FORCE_LINK : 0;
+ macb->phy_flags = pdata->phy_flags;
macb->rx_buffer = dma_alloc_coherent(CFG_MACB_RX_BUFFER_SIZE);
macb->rx_ring = dma_alloc_coherent(CFG_MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc));