diff options
Diffstat (limited to 'drivers/net/mvneta.c')
| -rw-r--r-- | drivers/net/mvneta.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 359c70c927..1e176dbdc2 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -166,7 +166,7 @@ #define MVNETA_MH_SIZE 2 #define TXQ_NUM 8 -#define RX_RING_SIZE 4 +#define RX_RING_SIZE 128 #define TRANSFER_TIMEOUT (10 * MSECOND) struct rxdesc { @@ -198,7 +198,7 @@ struct txdesc { struct mvneta_port { void __iomem *reg; - struct device_d dev; + struct device dev; struct eth_device edev; struct clk *clk; @@ -383,7 +383,7 @@ static int mvneta_send(struct eth_device *edev, void *data, int len) int ret, error, last_desc; /* Flush transmit data */ - dma_sync_single_for_device((unsigned long)data, len, DMA_TO_DEVICE); + dma_sync_single_for_device(&priv->dev, (unsigned long)data, len, DMA_TO_DEVICE); memset(txdesc, 0, sizeof(*txdesc)); /* Fill the Tx descriptor */ @@ -400,7 +400,7 @@ static int mvneta_send(struct eth_device *edev, void *data, int len) * the Tx port status register (PTXS). */ ret = wait_on_timeout(TRANSFER_TIMEOUT, !mvneta_pending_tx(priv)); - dma_sync_single_for_cpu((unsigned long)data, len, DMA_TO_DEVICE); + dma_sync_single_for_cpu(&priv->dev, (unsigned long)data, len, DMA_TO_DEVICE); if (ret) { dev_err(&edev->dev, "transmit timeout\n"); return ret; @@ -451,7 +451,7 @@ static int mvneta_recv(struct eth_device *edev) } /* invalidate current receive buffer */ - dma_sync_single_for_cpu((unsigned long)rxdesc->buf_phys_addr, + dma_sync_single_for_cpu(&priv->dev, (unsigned long)rxdesc->buf_phys_addr, ALIGN(PKTSIZE, 8), DMA_FROM_DEVICE); /* received packet is padded with two null bytes (Marvell header) */ @@ -459,7 +459,7 @@ static int mvneta_recv(struct eth_device *edev) rxdesc->data_size - MVNETA_MH_SIZE); ret = 0; - dma_sync_single_for_device((unsigned long)rxdesc->buf_phys_addr, + dma_sync_single_for_device(&priv->dev, (unsigned long)rxdesc->buf_phys_addr, ALIGN(PKTSIZE, 8), DMA_FROM_DEVICE); recv_err: @@ -706,7 +706,7 @@ static int mvneta_port_config(struct mvneta_port *priv) return 0; } -static int mvneta_probe(struct device_d *dev) +static int mvneta_probe(struct device *dev) { struct mvneta_port *priv; int ret; @@ -720,7 +720,7 @@ static int mvneta_probe(struct device_d *dev) return PTR_ERR(priv->clk); clk_enable(priv->clk); - ret = of_get_phy_mode(dev->device_node); + ret = of_get_phy_mode(dev->of_node); if (ret < 0) return ret; priv->intf = ret; @@ -755,8 +755,9 @@ static struct of_device_id mvneta_dt_ids[] = { { .compatible = "marvell,armada-xp-neta" }, { } }; +MODULE_DEVICE_TABLE(of, mvneta_dt_ids); -static struct driver_d mvneta_driver = { +static struct driver mvneta_driver = { .name = "mvneta", .probe = mvneta_probe, .of_compatible = DRV_OF_COMPAT(mvneta_dt_ids), |