mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-07-24 02:32:09 +08:00
Update to Linux 4.12
Linux baseline 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (v4.12).
This commit is contained in:
parent
e3dc39ee0c
commit
ef1655c144
@ -1 +1 @@
|
||||
Subproject commit b23afd384801711ab6dbccd259cc14cb09a1dcaf
|
||||
Subproject commit 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c
|
@ -3036,7 +3036,7 @@ dpaa_eth_priv_probe(struct platform_device *pdev, struct mac_device *mac_dev)
|
||||
|
||||
#ifndef __rtems__
|
||||
/* device used for DMA mapping */
|
||||
arch_setup_dma_ops(dev, 0, 0, NULL, false);
|
||||
set_dma_ops(dev, get_dma_ops(&pdev->dev));
|
||||
err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));
|
||||
if (err) {
|
||||
dev_err(dev, "dma_coerce_mask_and_coherent() failed\n");
|
||||
|
@ -704,6 +704,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id,
|
||||
goto no_mem;
|
||||
}
|
||||
|
||||
set_dma_ops(&pdev->dev, get_dma_ops(priv->dev));
|
||||
|
||||
ret = platform_device_add_data(pdev, &data, sizeof(data));
|
||||
if (ret)
|
||||
goto err;
|
||||
|
Loading…
x
Reference in New Issue
Block a user