diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-07-10 09:19:10 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-23 09:24:07 +0200 |
commit | ef1655c144b72f28d74557f1fc07d09a9d251a2b (patch) | |
tree | b89a9e82545bee574887dce81d0872e9e6ae99f6 /linux/drivers | |
parent | dpaa: Add <soc/fsl/dpaa.h> (diff) | |
download | rtems-libbsd-ef1655c144b72f28d74557f1fc07d09a9d251a2b.tar.bz2 |
Update to Linux 4.12
Linux baseline 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (v4.12).
Diffstat (limited to 'linux/drivers')
-rw-r--r-- | linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 | ||||
-rw-r--r-- | linux/drivers/net/ethernet/freescale/fman/mac.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index e010f5dc..c2e9b378 100644 --- a/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/linux/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -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"); diff --git a/linux/drivers/net/ethernet/freescale/fman/mac.c b/linux/drivers/net/ethernet/freescale/fman/mac.c index f04ae704..b058b4ad 100644 --- a/linux/drivers/net/ethernet/freescale/fman/mac.c +++ b/linux/drivers/net/ethernet/freescale/fman/mac.c @@ -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; |