UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/macb: fix capabilities configuration 

Capabilities configuration by macb_configure_caps() was moved far too late by
421d9df062 (net/macb: merge at91_ether driver into macb driver) which would
lead to badly configured hardware.
So, move this function to early probe and modify its prototype to re-gain its
original behavior.
DT data retrieval is also moved to simplify the probe code flow.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Ferre 2015-03-31 15:02:01 +02:00 committed by David S. Miller
parent da12011249
commit f6970505de
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/ethernet/cadence/macb.c
View File

@ -2132,10 +2132,13 @@ static const struct net_device_ops macb_netdev_ops = {
* Configure peripheral capacities according to device tree
* and integration options used
*/
static void macb_configure_caps(struct macb *bp)
static void macb_configure_caps(struct macb *bp, const struct macb_config *dt_conf)
{
u32 dcfg;
if (dt_conf)
bp->caps = dt_conf->caps;
if (MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2)
bp->caps |= MACB_CAPS_MACB_IS_GEM;
@ -2313,9 +2316,6 @@ static int macb_init(struct platform_device *pdev)
macb_or_gem_writel(bp, USRIO, val);
/* setup capacities */
macb_configure_caps(bp);
/* Set MII management clock divider */
val = macb_mdc_clk_div(bp);
val |= macb_dbw(bp);
@ -2720,6 +2720,20 @@ static int macb_probe(struct platform_device *pdev)
bp->queue_mask = queue_mask;
spin_lock_init(&bp->lock);
if (np) {
const struct of_device_id *match;
match = of_match_node(macb_dt_ids, np);
if (match && match->data) {
macb_config = match->data;
bp->dma_burst_length = macb_config->dma_burst_length;
init = macb_config->init;
}
}
/* setup capacities */
macb_configure_caps(bp, macb_config);
platform_set_drvdata(pdev, dev);
dev->irq = platform_get_irq(pdev, 0);
@ -2743,20 +2757,6 @@ static int macb_probe(struct platform_device *pdev)
bp->phy_interface = err;
}
if (np) {
const struct of_device_id *match;
match = of_match_node(macb_dt_ids, np);
if (match)
macb_config = match->data;
}
if (macb_config) {
bp->caps = macb_config->caps;
bp->dma_burst_length = macb_config->dma_burst_length;
init = macb_config->init;
}
/* IP specific init */
err = init(pdev);
if (err)