diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-09 09:15:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-09 09:15:46 -0700 |
| commit | 2025fef0ca0c8c7fa730a3e0399243721a4925f1 (patch) | |
| tree | 8f47e5caa973d648cf6a2aaa46b68c5fed2491df /arch/m68k | |
| parent | 5148408a5165e2f69203fcf4481a8153837ef260 (diff) | |
| parent | f61e64310b75733d782e930d1fb404b84699eed6 (diff) | |
| download | op-kernel-dev-2025fef0ca0c8c7fa730a3e0399243721a4925f1.zip op-kernel-dev-2025fef0ca0c8c7fa730a3e0399243721a4925f1.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer:
"Only a single fix to set the DMA masks in the ColdFire FEC platform
data structure.
This stops the warning from dma-mapping.h at boot time"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: set dma and coherent masks for platform FEC ethernets
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/coldfire/device.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c index 84938fd..908d583 100644 --- a/arch/m68k/coldfire/device.c +++ b/arch/m68k/coldfire/device.c @@ -135,7 +135,11 @@ static struct platform_device mcf_fec0 = { .id = 0, .num_resources = ARRAY_SIZE(mcf_fec0_resources), .resource = mcf_fec0_resources, - .dev.platform_data = FEC_PDATA, + .dev = { + .dma_mask = &mcf_fec0.dev.coherent_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = FEC_PDATA, + } }; #ifdef MCFFEC_BASE1 @@ -167,7 +171,11 @@ static struct platform_device mcf_fec1 = { .id = 1, .num_resources = ARRAY_SIZE(mcf_fec1_resources), .resource = mcf_fec1_resources, - .dev.platform_data = FEC_PDATA, + .dev = { + .dma_mask = &mcf_fec1.dev.coherent_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = FEC_PDATA, + } }; #endif /* MCFFEC_BASE1 */ #endif /* CONFIG_FEC */ |
